Skip to content

Commit 988f604

Browse files
committed
allow numbers for ids and names, check for existing array-keys to prevent error-messages
1 parent 081526b commit 988f604

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/WorkflowGui/Controller/WorkflowController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,15 +260,15 @@ protected function sanitizeConfiguration($configuration): array
260260

261261
if (isset($transitionConfig['options']['notes']['additionalFields'])) {
262262
foreach ($transitionConfig['options']['notes']['additionalFields'] as &$additionalField) {
263-
if (!$additionalField['setterFn']) {
263+
if (isset($additionalField['setterFn']) && !$additionalField['setterFn']) {
264264
unset ($additionalField['setterFn']);
265265
}
266266

267-
if (!$additionalField['title']) {
267+
if (isset($additionalField['title']) && !$additionalField['title']) {
268268
unset ($additionalField['title']);
269269
}
270270

271-
if (!$additionalField['required']) {
271+
if (isset($additionalField['required']) && !$additionalField['required']) {
272272
unset ($additionalField['required']);
273273
}
274274
}

src/WorkflowGui/Resources/public/js/pimcore/workflow/global_action.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ pimcore.plugin.workflow.global_action = Class.create({
175175
value: globalAction.getId(),
176176
fieldLabel: t('workflow_global_action_id'),
177177
allowBlank: false,
178-
regex: /^[a-zA-Z_]+$/
178+
regex: /^[a-zA-Z_0-9]+$/
179179
},
180180
{
181181
xtype: 'textfield',

src/WorkflowGui/Resources/public/js/pimcore/workflow/item.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ pimcore.plugin.workflow.item = Class.create({
337337
value: this.id,
338338
fieldLabel: t('workflow_name'),
339339
allowBlank: false,
340-
regex: /^[a-zA-Z_]+$/
340+
regex: /^[a-zA-Z_0-9]+$/
341341
},
342342
{
343343
xtype: 'checkbox',

src/WorkflowGui/Resources/public/js/pimcore/workflow/place.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pimcore.plugin.workflow.place = Class.create({
103103
value: place.getId(),
104104
fieldLabel: t('workflow_place_id'),
105105
allowBlank: false,
106-
regex: /^[a-zA-Z_]+$/
106+
regex: /^[a-zA-Z_0-9]+$/
107107
},
108108
{
109109
xtype: 'textfield',

src/WorkflowGui/Resources/public/js/pimcore/workflow/transition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ pimcore.plugin.workflow.transition = Class.create({
226226
value: transition.getId(),
227227
fieldLabel: t('workflow_transition_id'),
228228
allowBlank: false,
229-
regex: /^[a-zA-Z_]+$/
229+
regex: /^[a-zA-Z_0-9]+$/
230230
},
231231

232232
{

0 commit comments

Comments
 (0)