bugfix: edit workflow's title_template and content_template

blackholll · Aug 9, 2020 · 45d434b · 45d434b
1 parent c0c0366
commit 45d434b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/service/workflow/workflow_base_service.py b/service/workflow/workflow_base_service.py
@@ -64,7 +64,11 @@ def get_workflow_list(cls, name: str, page: int, per_page: int, workflow_id_list
                      view_permission_check=workflow_result_object.view_permission_check,
                      limit_expression=workflow_result_object.limit_expression,
                      display_form_str=workflow_result_object.display_form_str,
-                     creator=workflow_result_object.creator, gmt_created=str(workflow_result_object.gmt_created)[:19]))
+                     creator=workflow_result_object.creator, gmt_created=str(workflow_result_object.gmt_created)[:19],
+                     title_template=workflow_result_object.title_template,
+                     content_template=workflow_result_object.content_template
+                     )
+            )
         # 获取工作流管理员信息
         workflow_admin_queryset = WorkflowAdmin.objects.filter(
             workflow_id__in=workflow_result_id_list, is_deleted=0).all()

diff --git a/static/dist/js/workflow/workflow_manage.js b/static/dist/js/workflow/workflow_manage.js
@@ -105,6 +105,9 @@ function makeUserOption(data) {
     $("#limitExpression").val(data.limit_expression);
     $("#displayFormStr").val(data.display_form_str);
     $("#workflowId").val(data.id);
+    $("#titleTemplate").val(data.title_template);
+    $("#contentTemplate").val(data.content_template);
+
     $('#workflowModal').modal('show');
   }