sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Philipp Fromme 2020-06-23 15:51:26 +02:00
parent 102ca89073 8bc29e7f3e
commit 95e8a42db0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/features/rules/BpmnRules.js
View File

@ -268,7 +268,8 @@ function isSameOrganization(a, b) {
function isMessageFlowSource(element) { function isMessageFlowSource(element) {
return ( return (
is(element, 'bpmn:InteractionNode') && ( is(element, 'bpmn:InteractionNode') &&
!is(element, 'bpmn:BoundaryEvent') && (
!is(element, 'bpmn:Event') || ( !is(element, 'bpmn:Event') || (
is(element, 'bpmn:ThrowEvent') && is(element, 'bpmn:ThrowEvent') &&
hasEventDefinitionOrNone(element, 'bpmn:MessageEventDefinition') hasEventDefinitionOrNone(element, 'bpmn:MessageEventDefinition')
@ -280,6 +281,7 @@ function isMessageFlowSource(element) {
function isMessageFlowTarget(element) { function isMessageFlowTarget(element) {
return ( return (
is(element, 'bpmn:InteractionNode') && is(element, 'bpmn:InteractionNode') &&
!is(element, 'bpmn:BoundaryEvent') &&
!isForCompensation(element) && ( !isForCompensation(element) && (
!is(element, 'bpmn:Event') || ( !is(element, 'bpmn:Event') || (
is(element, 'bpmn:CatchEvent') && is(element, 'bpmn:CatchEvent') &&

2
test/spec/features/rules/BpmnRulesSpec.js
View File

@ -656,7 +656,7 @@ describe('features/modeling/rules - BpmnRules', function() {
expectCanConnect('Task_in_OtherProcess', 'BoundaryEvent_on_SubProcess', { expectCanConnect('Task_in_OtherProcess', 'BoundaryEvent_on_SubProcess', {
sequenceFlow: false, sequenceFlow: false,
messageFlow: true, messageFlow: false,
association: false, association: false,
dataAssociation: false dataAssociation: false
}); });