lib/openwfe/worklist/storeparticipant.rb in openwferu-0.9.9 vs lib/openwfe/worklist/storeparticipant.rb in openwferu-0.9.10

@@ -37,10 +37,11 @@
 #
 # John Mettraux at openwfe.org
 #
 
 require 'openwfe/utils'
+require 'openwfe/omixins'
 require 'openwfe/rudefinitions'
 require 'openwfe/storage/yamlfilestorage'
 require 'openwfe/participants/participant'
 
 
@@ -63,10 +64,11 @@
     #     end
     #
     #
     module StoreParticipantMixin
         include LocalParticipant
+        include FeiMixin
 
         #def initialize ()
         #end
 
         #
@@ -130,13 +132,14 @@
         #
         # This delete() method accepts a workitem or simply its FlowExpressionId
         # identifier.
         #
         def delete (wi_or_fei)
-            fei = wi_or_fei
-            fei = fei.fei if fei.is_a? InFlowWorkItem
-            super fei
+            #fei = wi_or_fei
+            #fei = fei.fei if fei.is_a? InFlowWorkItem
+            #super fei
+            super extract_fei(wi_or_fei)
         end
 
         #
         # A convenience method for delegating a workitem to another
         # store participant.
@@ -157,10 +160,10 @@
             self.each_value do |workitem|
                 result << workitem \
                     if (not workflow_instance_id) or workitem.fei.parent_wfid == workflow_instance_id
             end
 
-            return result
+            result
         end
 
         #
         # Returns the first workitem at hand.
         # As a StoreParticipant is usually implemented with a hash, two