Skip to content

Commit

Permalink
update 45 to fix issue #1143
Browse files Browse the repository at this point in the history
  • Loading branch information
@brunobuzzi
brunobuzzi committed Aug 10, 2020
1 parent 2b73155 commit a944d2b
Show file tree
Hide file tree
Showing 19 changed files with 34 additions and 36 deletions.
3 changes: 0 additions & 3 deletions repository/BpmCore.package/BpmEnvironment.class/instance/users.st
View file

This file was deleted.

4 changes: 4 additions & 0 deletions repository/BpmCore.package/BpmEnvironment.class/instance/usersAsOrderedCollection.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
usersAsOrderedCollection

^users asOrderedCollection
4 changes: 4 additions & 0 deletions repository/BpmCore.package/BpmEnvironment.class/instance/usersDetect.ifNone..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
usersDetect: aBlock ifNone: errorHandler

^users detect: aBlock ifNone: errorHandler
4 changes: 4 additions & 0 deletions repository/BpmCore.package/BpmEnvironment.class/instance/usersSelect..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Accessing
usersSelect: aBlock

^users select: aBlock
6 changes: 4 additions & 2 deletions repository/BpmCore.package/BpmEnvironment.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,11 @@
"unregisterApplicationAndRemove:ifNone:" : "brunobb 02/12/2020 11:03",
"unregisterUser:" : "brunobb 02/12/2020 11:03",
"unregisterUserGroup:" : "brunobb 02/12/2020 11:03",
"users" : "brunobb 02/12/2020 11:03",
"users:" : "brunobb 02/12/2020 11:03",
"usersAsOrderedCollection" : "brunobb 08/10/2020 14:18",
"usersAsSortedCollection:" : "brunobb 08/10/2020 13:51",
"usersDetect:ifNone:" : "brunobb 08/10/2020 14:14",
"usersDo:" : "brunobb 08/10/2020 13:43",
"usersIsEmpty" : "brunobb 08/10/2020 13:57",
"usersReject:" : "brunobb 08/10/2020 14:05" } }
"usersReject:" : "brunobb 08/10/2020 14:05",
"usersSelect:" : "brunobb 08/10/2020 14:13" } }
3 changes: 0 additions & 3 deletions repository/BpmCore.package/BpmRole.class/instance/users.st
View file

This file was deleted.

1 change: 0 additions & 1 deletion repository/BpmCore.package/BpmRole.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"ungrantUser:" : "brunobb 01/27/2020 11:07",
"ungrantUser:ifAbsent:" : "brunobb 01/30/2020 07:06",
"unregisterFromApplication:ifAbsent:" : "brunobb 02/04/2020 08:48",
"users" : "brunobb 01/27/2020 11:07",
"users:" : "brunobb 01/27/2020 11:07",
"usersAssociationsSize" : "bruno 07/24/2020 13:21",
"usersDo:" : "brunobb 08/10/2020 13:46",
Expand Down
2 changes: 1 addition & 1 deletion repository/BpmCore.package/monticello.meta/version
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion repository/BpmRuntime.package/BpmUser.class/class/getAvailableUsersToTake..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ task query
getAvailableUsersToTake: aBpmTaskAssignment
"The receiver answer a collection of <BpmUser>s having permissions to take the assignment <aBpmTaskAssignment> "

^(self getUsersIn: aBpmTaskAssignment bpmEnvironment) select: [:eachUser |
^aBpmTaskAssignment bpmEnvironment usersSelect: [:eachUser |
(eachUser rolesIn: aBpmTaskAssignment bpmEnvironment)
anySatisfy: [:eachRole | (eachRole application == aBpmTaskAssignment application) and: [eachRole isFrontofficeRole and: [eachRole name = aBpmTaskAssignment roleName]]]
]
Expand Down
4 changes: 2 additions & 2 deletions repository/BpmRuntime.package/BpmUser.class/class/getUserFinishedTask..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ task query
getUserFinishedTask: aBpmTaskInstance
"The receiver answer <aBpmUser> that has take the assignment to work on <aBpmTaskInstance>"

^(self getUsersIn: aBpmTaskInstance bpmEnvironment)
detect: [:each | (each getFinishedAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
^aBpmTaskInstance bpmEnvironment
usersDetect: [:each | (each getFinishedAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
ifNone: [^NoUserWorkingOnTaskException signal: 'No user finished this task']
4 changes: 2 additions & 2 deletions repository/BpmRuntime.package/BpmUser.class/class/getUserOrNilFinishedTask..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ task query
getUserOrNilFinishedTask: aBpmTaskInstance
"The receiver answer <aBpmUser> that has finished the assignment of task <aBpmTaskInstance>"

^(self getUsersIn: aBpmTaskInstance bpmEnvironment)
detect: [:each | (each getFinishedAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
^aBpmTaskInstance bpmEnvironment
usersDetect: [:each | (each getFinishedAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
ifNone: [nil]
4 changes: 2 additions & 2 deletions repository/BpmRuntime.package/BpmUser.class/class/getUserOrNilWorkingOn..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ task query
getUserOrNilWorkingOn: aBpmTaskInstance
"The receiver answer <aBpmUser> that has taken the assignment to work on <aBpmTaskInstance>"

^(self getUsersIn: aBpmTaskInstance bpmEnvironment)
detect: [:each | (each getCurrentAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
^aBpmTaskInstance bpmEnvironment
usersDetect: [:each | (each getCurrentAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
ifNone: [nil]
4 changes: 2 additions & 2 deletions repository/BpmRuntime.package/BpmUser.class/class/getUserWorkingOn..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ task query
getUserWorkingOn: aBpmTaskInstance
"The receiver answer <aBpmUser> that has taken the assignment to work on <aBpmTaskInstance>"

^(self getUsersIn: aBpmTaskInstance bpmEnvironment)
detect: [:each | (each getCurrentAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
^aBpmTaskInstance bpmEnvironment
usersDetect: [:each | (each getCurrentAssignmentsIn: aBpmTaskInstance bpmEnvironment) anySatisfy: [:eachAssing | eachAssing task == aBpmTaskInstance] ]
ifNone: [^NoUserWorkingOnTaskException signal: 'No user is working on this task']
4 changes: 0 additions & 4 deletions repository/BpmRuntime.package/BpmUser.class/class/getUsersIn..st
View file

This file was deleted.

2 changes: 1 addition & 1 deletion repository/BpmRuntime.package/BpmUser.class/instance/getVisibleUsersIn..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ getVisibleUsersIn: aBpmEnvironment
"Answer a collection of users <BpmUser> where the receiver is the admin of each user of the collection"
| applications |

(self isBackofficeUserAndAdminIn: aBpmEnvironment) ifTrue: [^aBpmEnvironment users].
(self isBackofficeUserAndAdminIn: aBpmEnvironment) ifTrue: [^aBpmEnvironment usersAsOrderedCollection].

(self isBackofficeUserIn: aBpmEnvironment) ifFalse: [^Dictionary new].

Expand Down
13 changes: 6 additions & 7 deletions repository/BpmRuntime.package/BpmUser.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@
"cache" : "brunobb 01/27/2020 11:09",
"cache:" : "brunobb 01/27/2020 11:09",
"getAdminUser" : "brunobb 01/27/2020 11:09",
"getAvailableUsersToTake:" : "brunobb 01/27/2020 11:09",
"getAvailableUsersToTake:" : "brunobb 08/10/2020 14:13",
"getExistingOrNewUserNamed:" : "brunobb 01/27/2020 11:09",
"getExistingOrNewUserNamed:password:" : "brunobb 01/27/2020 11:09",
"getExistingOrNewUserNamed:password:forEnvironment:" : "brunobb 01/27/2020 11:09",
"getFrontofficeUsersIn:" : "brunobb 01/28/2020 03:26",
"getUniqueUserNameFor:for:" : "brunobb 01/27/2020 11:09",
"getUserFinishedTask:" : "brunobb 01/27/2020 11:09",
"getUserFinishedTask:" : "brunobb 08/10/2020 14:14",
"getUserNamed:" : "brunobb 01/27/2020 11:09",
"getUserNamed:ifAbsent:" : "brunobb 01/27/2020 11:09",
"getUserOrNilFinishedTask:" : "brunobb 01/27/2020 11:09",
"getUserOrNilWorkingOn:" : "brunobb 01/27/2020 11:09",
"getUserWorkingOn:" : "brunobb 01/27/2020 11:09",
"getUsersIn:" : "brunobb 01/27/2020 11:09",
"getUserOrNilFinishedTask:" : "brunobb 08/10/2020 14:15",
"getUserOrNilWorkingOn:" : "brunobb 08/10/2020 14:15",
"getUserWorkingOn:" : "brunobb 08/10/2020 14:15",
"initializeCache" : "brunobb 01/27/2020 11:09",
"migrateToApplicationUser" : "brunobb 01/27/2020 11:09",
"newUsername:password:" : "brunobb 01/27/2020 11:09",
Expand Down Expand Up @@ -108,7 +107,7 @@
"getUserNotificationsInboxIn:" : "brunobb 01/27/2020 11:09",
"getVisibleApplicationsIn:" : "brunobb 02/04/2020 09:34",
"getVisibleRolesIn:" : "brunobb 02/04/2020 11:13",
"getVisibleUsersIn:" : "brunobb 02/07/2020 08:37",
"getVisibleUsersIn:" : "brunobb 08/10/2020 14:19",
"hasAccessTo:" : "brunobb 01/27/2020 11:09",
"hasAccessToEnvironmentManager" : "brunobb 01/28/2020 03:20",
"hasInboxFor:" : "brunobb 01/27/2020 11:09",
Expand Down
3 changes: 0 additions & 3 deletions repository/BpmRuntime.package/BpmUserGroup.class/instance/users.st
View file

This file was deleted.

1 change: 0 additions & 1 deletion repository/BpmRuntime.package/BpmUserGroup.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@
"removeUser:ifAbsent:" : "brunobb 05/16/2020 13:13",
"roles:" : "brunobb 05/16/2020 13:13",
"rolesSelect:" : "bruno 07/24/2020 13:15",
"users" : "brunobb 05/16/2020 13:13",
"users:" : "brunobb 05/16/2020 13:13",
"usersDo:" : "brunobb 08/10/2020 13:46" } }
2 changes: 1 addition & 1 deletion repository/BpmRuntime.package/monticello.meta/version
View file

Large diffs are not rendered by default.

0 comments on commit a944d2b

Please sign in to comment.