Merge branch changes #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Manas-Kenge merged 82 commits into main from test-1

Sep 1, 2025

backend/src/workflow/manager/api/services/workflow/transition.py

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     import json
     from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC, TRIGGER_USER_ACTION
+    from Products.DCWorkflow.Expression import Expression
     from plone.protect.interfaces import IDisableCSRFProtection
     from plone.restapi.deserializer import json_body
     from plone.restapi.services import Service
@@ Expand Down Expand Up / @@ -279,13 +280,21 @@ def reply(self): @@
                     guard = transition.getGuard()
                     guard_data = body['guard']
                     if 'permissions' in guard_data:
-                        guard.permissions = tuple(guard_data['permissions'])
+                        guard.permissions = tuple(
+                            Expression('string:%s' % p) for p in guard_data['permissions']
+                        )
                     if 'roles' in guard_data:
-                        guard.roles = tuple(guard_data['roles'])
+                        guard.roles = tuple(
+                            Expression('string:%s' % r) for r in guard_data['roles']
+                        )
                     if 'groups' in guard_data:
-                        guard.groups = tuple(guard_data['groups'])
-                    if 'expr' in guard_data:
-                        guard.expr = guard_data['expr']
+                        guard.groups = tuple(
+                            Expression('string:%s' % g) for g in guard_data['groups']
+                        )
+                    if 'expr' in guard_data and guard_data['expr']:
+                        guard.expr = Expression(guard_data['expr'])
+                    else:
+                        guard.expr = Expression('')
                     transition.guard = guard
                 if 'states_with_this_transition' in body:
@@ Expand Down @@

backend/src/workflow/manager/api/services/workflow/workflow.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,8 @@ def reply(self): @@
                 self.request.response.setStatus(404)
                 return {"error": f"Workflow '{workflow_id}' not found."}
-            assigned_types = base.get_assigned_types_for(workflow_id)
+            # Safety Check: Prevent deletion if workflow is in use.
+            assigned_types = base._get_assigned_types_for(workflow_id)
             if assigned_types:
                 self.request.response.setStatus(400)
                 return {"error": f"Cannot delete workflow. It is still assigned to: {', '.join(assigned_types)}"}
@@ Expand Down @@

frontend/packages/volto-workflow-manager/locales/de/LC_MESSAGES/volto.po

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,11 +11,36 @@ msgstr "" @@
     "Content-Transfer-Encoding: \n"
     "Plural-Forms: \n"
+    #. Default: "Assign"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assign"
+    msgstr ""
+    #. Default: "Assign Workflow"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assign Workflow"
+    msgstr ""
+    #. Default: "Assigning..."
+    #: components/Workflow/AssignWorkflow
+    msgid "Assigning..."
+    msgstr ""
+    #. Default: "Assignment Failed"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assignment Failed"
+    msgstr ""
     #. Default: "Block"
     #: components/Workflow/WorkflowSidebar
     msgid "Block"
     msgstr ""
+    #. Default: "Cancel"
+    #: components/Workflow/AssignWorkflow
+    msgid "Cancel"
+    msgstr ""
     #. Default: "Document"
     #: components/Workflow/WorkflowSidebar
     msgid "Document"
@@ Expand All / @@ -31,6 +56,16 @@ msgstr "" @@
     msgid "Expand sidebar"
     msgstr ""
+    #. Default: "Failed to delete workflow."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Failed to delete workflow."
+    msgstr ""
+    #. Default: "Failed to rename workflow."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Failed to rename workflow."
+    msgstr ""
     #. Default: "No errors found in the workflow."
     #: components/Workflow/ActionsToolbar
     msgid "No errors found in the workflow."
@@ Expand All / @@ -41,6 +76,16 @@ msgstr "" @@
     msgid "Order"
     msgstr ""
+    #. Default: "Select a content type..."
+    #: components/Workflow/AssignWorkflow
+    msgid "Select a content type..."
+    msgstr ""
+    #. Default: "Select the content type you would like to assign this workflow to."
+    #: components/Workflow/AssignWorkflow
+    msgid "Select the content type you would like to assign this workflow to."
+    msgstr ""
     #. Default: "Settings"
     #: components/Workflow/WorkflowSidebar
     msgid "Settings"
@@ Expand Down Expand Up / @@ -76,6 +121,11 @@ msgstr "" @@
     msgid "The new transition has been added successfully."
     msgstr ""
+    #. Default: "The workflow has been assigned successfully."
+    #: components/Workflow/AssignWorkflow
+    msgid "The workflow has been assigned successfully."
+    msgstr ""
     #. Default: "Transition Created"
     #: components/Transitions/CreateTransition
     msgid "Transition Created"
@@ Expand Down Expand Up / @@ -105,3 +155,23 @@ msgstr "" @@
     #: components/Workflow/WorkflowSidebar
     msgid "Workflow"
     msgstr ""
+    #. Default: "Workflow Assigned"
+    #: components/Workflow/AssignWorkflow
+    msgid "Workflow Assigned"
+    msgstr ""
+    #. Default: "Workflow Manager"
+    #: components/Controlpanel/WorkflowPanel
+    msgid "Workflow Manager"
+    msgstr ""
+    #. Default: "Workflow deleted successfully."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Workflow deleted successfully."
+    msgstr ""
+    #. Default: "Workflow renamed successfully."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Workflow renamed successfully."
+    msgstr ""

frontend/packages/volto-workflow-manager/locales/en/LC_MESSAGES/volto.po

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,11 +11,36 @@ msgstr "" @@
     "Content-Transfer-Encoding: \n"
     "Plural-Forms: \n"
+    #. Default: "Assign"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assign"
+    msgstr ""
+    #. Default: "Assign Workflow"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assign Workflow"
+    msgstr ""
+    #. Default: "Assigning..."
+    #: components/Workflow/AssignWorkflow
+    msgid "Assigning..."
+    msgstr ""
+    #. Default: "Assignment Failed"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assignment Failed"
+    msgstr ""
     #. Default: "Block"
     #: components/Workflow/WorkflowSidebar
     msgid "Block"
     msgstr ""
+    #. Default: "Cancel"
+    #: components/Workflow/AssignWorkflow
+    msgid "Cancel"
+    msgstr ""
     #. Default: "Document"
     #: components/Workflow/WorkflowSidebar
     msgid "Document"
@@ Expand All / @@ -31,6 +56,16 @@ msgstr "" @@
     msgid "Expand sidebar"
     msgstr ""
+    #. Default: "Failed to delete workflow."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Failed to delete workflow."
+    msgstr ""
+    #. Default: "Failed to rename workflow."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Failed to rename workflow."
+    msgstr ""
     #. Default: "No errors found in the workflow."
     #: components/Workflow/ActionsToolbar
     msgid "No errors found in the workflow."
@@ Expand All / @@ -41,6 +76,16 @@ msgstr "" @@
     msgid "Order"
     msgstr ""
+    #. Default: "Select a content type..."
+    #: components/Workflow/AssignWorkflow
+    msgid "Select a content type..."
+    msgstr ""
+    #. Default: "Select the content type you would like to assign this workflow to."
+    #: components/Workflow/AssignWorkflow
+    msgid "Select the content type you would like to assign this workflow to."
+    msgstr ""
     #. Default: "Settings"
     #: components/Workflow/WorkflowSidebar
     msgid "Settings"
@@ Expand Down Expand Up / @@ -76,6 +121,11 @@ msgstr "" @@
     msgid "The new transition has been added successfully."
     msgstr ""
+    #. Default: "The workflow has been assigned successfully."
+    #: components/Workflow/AssignWorkflow
+    msgid "The workflow has been assigned successfully."
+    msgstr ""
     #. Default: "Transition Created"
     #: components/Transitions/CreateTransition
     msgid "Transition Created"
@@ Expand Down Expand Up / @@ -105,3 +155,23 @@ msgstr "" @@
     #: components/Workflow/WorkflowSidebar
     msgid "Workflow"
     msgstr ""
+    #. Default: "Workflow Assigned"
+    #: components/Workflow/AssignWorkflow
+    msgid "Workflow Assigned"
+    msgstr ""
+    #. Default: "Workflow Manager"
+    #: components/Controlpanel/WorkflowPanel
+    msgid "Workflow Manager"
+    msgstr ""
+    #. Default: "Workflow deleted successfully."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Workflow deleted successfully."
+    msgstr ""
+    #. Default: "Workflow renamed successfully."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Workflow renamed successfully."
+    msgstr ""

frontend/packages/volto-workflow-manager/locales/es/LC_MESSAGES/volto.po

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,11 +18,36 @@ msgstr "" @@
     "X-Is-Fallback-For: es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-sv es-gt es-hn es-mx es-ni es-pa es-py es-pe es-pr es-us es-uy es-ve\n"
     "X-Generator: Poedit 2.2.1\n"
+    #. Default: "Assign"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assign"
+    msgstr ""
+    #. Default: "Assign Workflow"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assign Workflow"
+    msgstr ""
+    #. Default: "Assigning..."
+    #: components/Workflow/AssignWorkflow
+    msgid "Assigning..."
+    msgstr ""
+    #. Default: "Assignment Failed"
+    #: components/Workflow/AssignWorkflow
+    msgid "Assignment Failed"
+    msgstr ""
     #. Default: "Block"
     #: components/Workflow/WorkflowSidebar
     msgid "Block"
     msgstr ""
+    #. Default: "Cancel"
+    #: components/Workflow/AssignWorkflow
+    msgid "Cancel"
+    msgstr ""
     #. Default: "Document"
     #: components/Workflow/WorkflowSidebar
     msgid "Document"
@@ Expand All / @@ -38,6 +63,16 @@ msgstr "" @@
     msgid "Expand sidebar"
     msgstr ""
+    #. Default: "Failed to delete workflow."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Failed to delete workflow."
+    msgstr ""
+    #. Default: "Failed to rename workflow."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Failed to rename workflow."
+    msgstr ""
     #. Default: "No errors found in the workflow."
     #: components/Workflow/ActionsToolbar
     msgid "No errors found in the workflow."
@@ Expand All / @@ -48,6 +83,16 @@ msgstr "" @@
     msgid "Order"
     msgstr ""
+    #. Default: "Select a content type..."
+    #: components/Workflow/AssignWorkflow
+    msgid "Select a content type..."
+    msgstr ""
+    #. Default: "Select the content type you would like to assign this workflow to."
+    #: components/Workflow/AssignWorkflow
+    msgid "Select the content type you would like to assign this workflow to."
+    msgstr ""
     #. Default: "Settings"
     #: components/Workflow/WorkflowSidebar
     msgid "Settings"
@@ Expand Down Expand Up / @@ -83,6 +128,11 @@ msgstr "" @@
     msgid "The new transition has been added successfully."
     msgstr ""
+    #. Default: "The workflow has been assigned successfully."
+    #: components/Workflow/AssignWorkflow
+    msgid "The workflow has been assigned successfully."
+    msgstr ""
     #. Default: "Transition Created"
     #: components/Transitions/CreateTransition
     msgid "Transition Created"
@@ Expand Down Expand Up / @@ -112,3 +162,23 @@ msgstr "" @@
     #: components/Workflow/WorkflowSidebar
     msgid "Workflow"
     msgstr ""
+    #. Default: "Workflow Assigned"
+    #: components/Workflow/AssignWorkflow
+    msgid "Workflow Assigned"
+    msgstr ""
+    #. Default: "Workflow Manager"
+    #: components/Controlpanel/WorkflowPanel
+    msgid "Workflow Manager"
+    msgstr ""
+    #. Default: "Workflow deleted successfully."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Workflow deleted successfully."
+    msgstr ""
+    #. Default: "Workflow renamed successfully."
+    #: components/Controlpanel/WorkflowTable
+    msgid "Workflow renamed successfully."
+    msgstr ""

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge branch changes #29

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!