Skip to content

Commit

Permalink
[Workflows] Fix workflowTransitionHandler not considering global acti…
Browse files Browse the repository at this point in the history
…ons (#296)
  • Loading branch information
orjansandell authored Nov 3, 2023
1 parent 15afc7e commit 839254d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions public/js/pimcore/elementservice.js
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,6 @@ pimcore.elementservice.getWorkflowActionsButton = function(workflows, elementTyp

var workflowTransitionHandler = function (workflow, transition, elementEditor, elementId, elementType) {
var applyWorkflow = function (workflow, transition, elementEditor, elementId, elementType) {
transition.isGlobalAction = false;
if (transition.notes) {
new pimcore.workflow.transitionPanel(elementType, elementId, elementEditor, workflow.name, transition);
} else {
Expand Down Expand Up @@ -1077,7 +1076,7 @@ pimcore.elementservice.getWorkflowActionsButton = function(workflows, elementTyp

for (i = 0; i < workflow.allowedTransitions.length; i++) {
var transition = workflow.allowedTransitions[i];

transition.isGlobalAction = false;
items.push({
text: t(transition.label),
iconCls: transition.iconCls,
Expand All @@ -1090,7 +1089,7 @@ pimcore.elementservice.getWorkflowActionsButton = function(workflows, elementTyp

for (i = 0; i < workflow.globalActions.length; i++) {
var transition = workflow.globalActions[i];

transition.isGlobalAction = true;
items.push({
text: t(transition.label),
iconCls: transition.iconCls,
Expand Down

0 comments on commit 839254d

Please sign in to comment.