Skip to content

Commit ca98055

Browse files
Revert PR changes for CallActivity BPMN Issue
1 parent 84841d1 commit ca98055

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

resources/js/processes/modeler/components/inspector/TaskAssignment.vue

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,10 @@
126126
return this.$root.$children[0].process;
127127
},
128128
assignmentLockGetter () {
129-
if (this.node.$type === 'bpmn:CallActivity') {
130-
return _.get(this.node.config && this.safeJsonParse(this.node.config), "assignmentLock") || false;
131-
} else {
132-
return _.get(this.node, "assignmentLock") || false;
133-
}
129+
return _.get(this.node, "assignmentLock") || false;
134130
},
135131
allowReassignmentGetter () {
136-
if (this.node.$type === 'bpmn:CallActivity') {
137-
return _.get(this.node.config && this.safeJsonParse(this.node.config), "allowReassignment") || false;
138-
} else {
139-
return _.get(this.node, "allowReassignment") || false;
140-
}
132+
return _.get(this.node, "allowReassignment") || false;
141133
},
142134
assignedUserGetter () {
143135
let value = _.get(this.node, "assignedUsers");
@@ -280,7 +272,7 @@
280272
case 'ALLOW_REASSIGNMENT':
281273
return this.allowReassignmentGetter;
282274
default:
283-
const config = this.node.config && this.safeJsonParse(this.node.config) || {};
275+
const config = this.node.config && JSON.parse(this.node.config) || {};
284276
return config[window._.camelCase(configurable)] || false;
285277
}
286278
},
@@ -291,7 +283,7 @@
291283
case 'ALLOW_REASSIGNMENT':
292284
return this.allowReassignmentSetter(value);
293285
default:
294-
const config = this.node.config && this.safeJsonParse(this.node.config) || {};
286+
const config = this.node.config && JSON.parse(this.node.config) || {};
295287
config[window._.camelCase(configurable)] = value;
296288
this.$set(this.node, "config", JSON.stringify(config));
297289
}
@@ -319,25 +311,13 @@
319311
* Update assignmentLock property
320312
*/
321313
assignmentLockSetter (value) {
322-
if (this.node.$type === 'bpmn:CallActivity') {
323-
const config = this.node.config && this.safeJsonParse(this.node.config) || {};
324-
config.assignmentLock = value;
325-
this.$set(this.node, "config", JSON.stringify(config));
326-
} else {
327-
this.$set(this.node, "assignmentLock", value);
328-
}
314+
this.$set(this.node, "assignmentLock", value);
329315
},
330316
/**
331317
* Update allowReassignment property
332318
*/
333319
allowReassignmentSetter (value) {
334-
if (this.node.$type === 'bpmn:CallActivity') {
335-
const config = this.node.config && this.safeJsonParse(this.node.config) || {};
336-
config.allowReassignment = value;
337-
this.$set(this.node, "config", JSON.stringify(config));
338-
} else {
339-
this.$set(this.node, "allowReassignment", value);
340-
}
320+
this.$set(this.node, "allowReassignment", value);
341321
},
342322
/**
343323
* Update the event of the editer property

0 commit comments

Comments
 (0)