transitions api add attr: attribute_type_id

blackholll · Sep 29, 2019 · 037b082 · 037b082
1 parent 16b6410
commit 037b082
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/service/ticket/ticket_base_service.py b/service/ticket/ticket_base_service.py
@@ -960,11 +960,13 @@ def get_ticket_transition(cls, ticket_id, username):
         if ticket_obj.in_add_node:
             # 加签状态下，只允许"完成"操作, 完成后工单处理人设为add_node_man
             transition_dict_list = [dict(transition_id=0, transition_name='完成', field_require_check=False,
-                                         is_accept=False, in_add_node=True, alert_enable=False, alert_text='')]
+                                         is_accept=False, in_add_node=True, alert_enable=False, alert_text='',
+                                         attribute_type_id=CONSTANT_SERVICE.TRANSITION_ATTRIBUTE_TYPE_OTHER)]
             return transition_dict_list, ''
         if msg['need_accept']:
             transition_dict_list = [dict(transition_id=0, transition_name='接单', field_require_check=False,
-                                         is_accept=True, in_add_node=False, alert_enable=False, alert_text='')]
+                                         is_accept=True, in_add_node=False, alert_enable=False, alert_text='',
+                                         attribute_type_id=CONSTANT_SERVICE.TRANSITION_ATTRIBUTE_TYPE_OTHER)]
             return transition_dict_list, ''
 
         transition_queryset, msg = WorkflowTransitionService.get_state_transition_queryset(ticket_obj.state_id)
@@ -973,7 +975,7 @@ def get_ticket_transition(cls, ticket_id, username):
             transition_dict = dict(transition_id=transition.id, transition_name=transition.name,
                                    field_require_check=transition.field_require_check, is_accept=False,
                                    in_add_node=False, alert_enable=transition.alert_enable,
-                                   alert_text=transition.alert_text)
+                                   alert_text=transition.alert_text, attribute_type_id=transition.attribute_type_id)
             transition_dict_list.append(transition_dict)
         return transition_dict_list, ''