update 07 to fix issue #1143

brunobuzzi · Jul 24, 2020 · 87a1734 · 87a1734
1 parent ef952dc
commit 87a1734
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 12 deletions.
diff --git a/repository/BpmCore.package/BpmEventDefinition.class/instance/canUser.createProcess..st b/repository/BpmCore.package/BpmEventDefinition.class/instance/canUser.createProcess..st
@@ -0,0 +1,6 @@
+other
+canUser: aBpmUser createProcess: aBpmProcessDefinition
+
+	self isStartEvent ifFalse: [^false].
+
+	^(aBpmUser rolesIn: aBpmProcessDefinition bpmEnvironment) anySatisfy: [:eachRole | roles includesIdentical: eachRole]
diff --git a/repository/BpmCore.package/BpmEventDefinition.class/methodProperties.json b/repository/BpmCore.package/BpmEventDefinition.class/methodProperties.json
@@ -6,6 +6,7 @@
 		"addToParentProcess" : "BrunoBB 08/06/2016 14:41",
 		"attachedTask" : "brunobb 10/18/2017 12:13",
 		"attachedTask:" : "brunobb 10/18/2017 12:13",
+		"canUser:createProcess:" : "bruno 07/24/2020 13:40",
 		"cycle" : "BrunoBB 08/06/2016 14:27",
 		"cycle:" : "BrunoBB 08/06/2016 14:27",
 		"drawFirstOn:" : "BrunoBB 12/06/2016 04:26",

diff --git a/repository/BpmCore.package/BpmProcessPathDefinition.class/instance/canCreateProcess..st b/repository/BpmCore.package/BpmProcessPathDefinition.class/instance/canCreateProcess..st
@@ -4,4 +4,4 @@ canCreateProcess: aBpmUser
 
 	aBpmUser ifNil: [^true]. "a process can be created with anonymous user"
 
-	^(aBpmUser isBackofficeUserAndAdminIn: processDefinition bpmEnvironment) or: [aBpmUser includesAnyRoleOf: startEvent roles in: processDefinition bpmEnvironment]
+	^(aBpmUser isBackofficeUserAndAdminIn: processDefinition bpmEnvironment) or: [startEvent canUser: aBpmUser createProcess: processDefinition]
diff --git a/repository/BpmCore.package/BpmProcessPathDefinition.class/instance/getAllRoles.st b/repository/BpmCore.package/BpmProcessPathDefinition.class/instance/getAllRoles.st
@@ -5,6 +5,7 @@ getAllRoles
 
 	allRoles := OrderedCollection new.
 
-	tasks do: [:each | allRoles addAll: each roles].
+	tasks do: [:eachTask | 
+		eachTask rolesDo: [:eachRole | allRoles add: eachRole]].
 
 	^allRoles
diff --git a/repository/BpmCore.package/BpmProcessPathDefinition.class/methodProperties.json b/repository/BpmCore.package/BpmProcessPathDefinition.class/methodProperties.json
@@ -10,14 +10,14 @@
 		"addTask:" : "BrunoBB 10/27/2015 17:17",
 		"addTransition:" : "BrunoBB 10/27/2015 17:20",
 		"canBeStartedByAnonymousForm" : "BrunoBB 04/10/2016 17:44",
-		"canCreateProcess:" : "brunobb 01/28/2020 04:11",
+		"canCreateProcess:" : "bruno 07/24/2020 13:41",
 		"endEvents" : "BrunoBB 10/27/2015 17:25",
 		"endEvents:" : "BrunoBB 10/27/2015 17:25",
 		"gateways" : "BrunoBB 10/27/2015 15:21",
 		"gateways:" : "BrunoBB 10/27/2015 15:21",
 		"getAllArtifacts" : "BrunoBB 06/22/2016 11:44",
 		"getAllFieldNames" : "BrunoBB 11/12/2016 07:55",
-		"getAllRoles" : "BrunoBB 04/11/2016 09:49",
+		"getAllRoles" : "bruno 07/24/2020 13:43",
 		"getAnonymousFormName" : "brunobb 12/04/2018 06:53",
 		"getEndEventNamed:ifNone:" : "BrunoBB 10/28/2015 12:13",
 		"getGatewayNamed:ifNone:" : "BrunoBB 10/28/2015 12:12",

diff --git a/repository/BpmCore.package/monticello.meta/version b/repository/BpmCore.package/monticello.meta/version
diff --git a/...untime.package/BpmSystemQueryOperation.class/instance/getCurrentTaskAssignmentsWithId..st b/...untime.package/BpmSystemQueryOperation.class/instance/getCurrentTaskAssignmentsWithId..st
@@ -7,10 +7,9 @@ getCurrentTaskAssignmentsWithId: processId
 	assignments := user getAllTaskAssignmentsWithId: processId in: bpmEnvironment.
 
 	"here search for already TAKEN <BpmTaskAssignment>"
-	self getAllUsers do: [:eachUser | | possibleAssignments roles |
+	self getAllUsers do: [:eachUser | | possibleAssignments |
 			possibleAssignments := (GsQuery fromSelectBlock: {:each | each.processId = processId} on: (eachUser getCurrentAssignmentsIn: bpmEnvironment)) queryResult.
-			roles := user roles.
-			assignments addAll: (possibleAssignments select: [:eachAssignment | roles identityIncludes: eachAssignment role]) .
+			assignments addAll: (possibleAssignments select: [:eachAssignment | user rolesIdentityIncludes: eachAssignment role]) .
 	].
 
 	^assignments
diff --git a/repository/BpmRuntime.package/BpmSystemQueryOperation.class/methodProperties.json b/repository/BpmRuntime.package/BpmSystemQueryOperation.class/methodProperties.json
@@ -9,7 +9,7 @@
 		"getCurrentTaskAssignmentsInApplication:" : "brunobb 03/21/2019 09:14",
 		"getCurrentTaskAssignmentsInApplication:andProcess:" : "brunobb 03/21/2019 09:15",
 		"getCurrentTaskAssignmentsInProcess:" : "brunobb 03/21/2019 09:14",
-		"getCurrentTaskAssignmentsWithId:" : "brunobb 09/10/2018 09:04",
+		"getCurrentTaskAssignmentsWithId:" : "bruno 07/24/2020 13:45",
 		"getFinishedAssignmentsIn:processName:formName:fieldName:initialValue:" : "brunobb 03/25/2019 08:43",
 		"getFinishedAssignmentsIn:processName:formName:fieldName:initialValue:endValue:" : "brunobb 03/25/2019 08:43",
 		"getFinishedTaskAssignmentsInApplication:" : "brunobb 03/21/2019 09:14",

diff --git a/repository/BpmRuntime.package/BpmUser.class/instance/removeFromCache.st b/repository/BpmRuntime.package/BpmUser.class/instance/removeFromCache.st
@@ -4,7 +4,7 @@ removeFromCache
 
 	self isAdminUser ifTrue: [ImproperBpmOperationException signal: '[admin] user can no be removed'].
 
-	self roles do: [:eachRole | eachRole ungrantUser: self].
+	self rolesDo: [:eachRole | eachRole ungrantUser: self].
 	rolesAssociation := Set new.
 
 	self getBpmEnvironments do: [:eachEnv | eachEnv unregisterUser: self].

diff --git a/repository/BpmRuntime.package/BpmUser.class/instance/rolesDo..st b/repository/BpmRuntime.package/BpmUser.class/instance/rolesDo..st
@@ -0,0 +1,4 @@
+Accessing
+rolesDo: aBlock
+
+	roles do: aBlock
diff --git a/repository/BpmRuntime.package/BpmUser.class/instance/rolesIdentityIncludes..st b/repository/BpmRuntime.package/BpmUser.class/instance/rolesIdentityIncludes..st
@@ -0,0 +1,4 @@
+Accessing
+rolesIdentityIncludes: aBpmRole
+
+	^roles identityIncludes: aBpmRole
diff --git a/repository/BpmRuntime.package/BpmUser.class/methodProperties.json b/repository/BpmRuntime.package/BpmUser.class/methodProperties.json
@@ -146,7 +146,7 @@
 		"printSystemRoleStructureIn:" : "brunobb 01/27/2020 11:09",
 		"regularListPagingSize" : "brunobb 01/27/2020 11:09",
 		"regularListPagingSize:" : "brunobb 01/27/2020 11:09",
-		"removeFromCache" : "brunobb 01/27/2020 11:09",
+		"removeFromCache" : "bruno 07/24/2020 13:46",
 		"removeFromGroup:" : "brunobb 01/30/2020 06:53",
 		"removeFromUserGroupsWith:" : "brunobb 01/30/2020 07:09",
 		"removeProperty:" : "brunobb 01/27/2020 11:09",
@@ -164,6 +164,8 @@
 		"roles:" : "brunobb 01/27/2020 11:09",
 		"rolesAssociationIsEmpty" : "bruno 07/24/2020 13:18",
 		"rolesAssociationSize" : "bruno 07/24/2020 13:19",
+		"rolesDo:" : "bruno 07/24/2020 13:46",
+		"rolesIdentityIncludes:" : "bruno 07/24/2020 13:44",
 		"rolesIn:" : "bruno 07/24/2020 13:15",
 		"rolesIsEmpty" : "bruno 07/24/2020 13:18",
 		"setCentralUserNamed:" : "brunobb 01/27/2020 11:09",

diff --git a/repository/BpmRuntime.package/monticello.meta/version b/repository/BpmRuntime.package/monticello.meta/version
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ canCreateProcess: aBpmUser

		aBpmUser ifNil: [^true]. "a process can be created with anonymous user"

		^(aBpmUser isBackofficeUserAndAdminIn: processDefinition bpmEnvironment) or: [aBpmUser includesAnyRoleOf: startEvent roles in: processDefinition bpmEnvironment]
		^(aBpmUser isBackofficeUserAndAdminIn: processDefinition bpmEnvironment) or: [startEvent canUser: aBpmUser createProcess: processDefinition]