Changeset 621

Timestamp:

10/21/08 09:17:00 (5 years ago)

Author:

aculapov

Message:

• for the change_type operation if we don't have a type declared in the oforge-workflow then hide this operation from the system

File:

• trunk/plugins/workflowcontrollerplugin/workflowcontroller/controller.py (modified) (5 diffs)

trunk/plugins/workflowcontrollerplugin/workflowcontroller/controller.py

@@ -170 +170 @@
                     if actions.has_key(remove_action) :
                         actions.pop(remove_action)
+        
+        # now remove the actions that have the change_type operation and 
+        #if we don't have the type defined
+        
+        # check to see if we have the type defined
+        type_flag = True
+        for key in self.workflow_fields.keys() :
+            field_name, value, option = key
+            if ticket['type'] == value : 
+                type_flag = False
+                break
+        
+        if type_flag :
+            for action in self.actions.keys():
+                if 'change_type' in self.actions[action]['operations'] :
+                    # if we have more than one operation then just 
+                    # delete the operation
+                    if len(self.actions[action]['operations']) > 1 :
+                        self.actions[action]['operations'].remove('change_type')
+                    else :
+                        # delete the action
+                        actions.pop(action)
+        
         # transform into a list of tuples
         return_actions = []
         for key in actions.keys() :
             return_actions.append(( actions[key], key))
-        # log the processing
-        # self.log.warning('actions for state ' + ticket.values['status'] + ':  ' 
-        #                  + str(return_actions))
+        
         # return the list
         return return_actions
@@ -198 +219 @@
         
         # call the parent
-        action_name, parent_tags, parent_hints = self.parent.render_ticket_action_control(req, ticket, action)
+        action_name, parent_tags, parent_hints = self.parent \
+            .render_ticket_action_control(req, ticket, action)
         
         this_action = self.actions[action]      
@@ -210 +232 @@
                 tag_element = None
                 if len(owners) == 1 :
-                    tag_element = tag(['to ', tag.input(type='text', value=owners[0], id=id,
-                                                     name=id, )])
+                    tag_element = tag(['to ', 
+                                       tag.input(type='text', 
+                                                 value=owners[0], 
+                                                 id=id, name=id, )])
                 elif len(owners) > 1:
                     tag_element = tag([_("to "), tag.select(
@@ -283 +307 @@
                         id=id, name=id)]))
                     hints.append(_("The resolution will be set. "))
+        
         # if we computed some new control         
         if len(control) > 0:
@@ -317 +342 @@
             h = _("The %s will be set to %s. ") % (field_name, field_values[0])
         else:
-            id = self._create_id_for_tag(action, 'resolve_resolution')
-            selected_option = req.args.get(id, ticket['resolution'])
+            id = self._create_id_for_tag(action, 'change_type')
+            selected_option = req.args.get(id, ticket['field_name'])
             c = tag(['as ', tag.select(
                 [tag.option(x, selected=(x == selected_option or None))