Skip to content

Commit 419f45b

Browse files
SilverYoChammoqui
authored andcommitted
Feature 13497: it is now possible in a workflow to replace an incumbent in a REMOVED state by a substitute.
1 parent 293d640 commit 419f45b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

processManager/processManager-war/src/main/java/org/silverpeas/processmanager/ProcessManagerSessionController.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -607,11 +607,10 @@ private List<String> getUsers(QualifiedUsers qualifiedUsers, boolean useCurrentR
607607
roles.clear();
608608
}
609609
}
610-
611-
String[] userIds = getOrganisationController().getUsersIdsByRoleNames(getComponentId(), roles);
612-
for (final String userId : userIds) {
613-
users.add(userId);
614-
}
610+
final boolean lookAlsoForRemoved = getCurrentReplacement() != null;
611+
final String[] userIds = getOrganisationController().getUsersIdsByRoleNames(getComponentId(),
612+
roles, lookAlsoForRemoved);
613+
users.addAll(Arrays.asList(userIds));
615614

616615
// Process related groups
617616
RelatedGroup[] relatedGroups = qualifiedUsers.getRelatedGroups();

processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement-templates.jsp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@
240240
v-on:api="selectIncumbentApi = $event"
241241
v-on:selection-change="incumbentChanged($event.selectedUserIds)"
242242
v-bind:initial-user-ids="replacement.incumbent && replacement.incumbent.id"
243+
v-bind:include-removed-users="true"
243244
v-bind:read-only="!(context.currentUser.isSupervisor && isCreation)"
244245
v-bind:role-filter="incumbentRoleFilter"
245246
v-bind:component-id-filter="context.componentInstanceId"></silverpeas-user-group-select>
@@ -263,6 +264,7 @@
263264
v-on:api="selectSubstituteApi = $event"
264265
v-on:selection-change="substituteChanged($event.selectedUserIds)"
265266
v-bind:initial-user-ids="replacement.substitute && replacement.substitute.id"
267+
v-bind:include-removed-users="true"
266268
v-bind:role-filter="selectedSubstituteFilterRoles"
267269
v-bind:component-id-filter="context.componentInstanceId"></silverpeas-user-group-select>
268270
</div>

processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.service.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
return User.get({
4848
component : context.componentInstanceId,
4949
userStatesToExclude : ['DEACTIVATED'],
50+
includeRemoved : true,
5051
roles : roleName
5152
}).then(function(users) {
5253
users.forEach(function(user) {

0 commit comments

Comments
 (0)