You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/05/23 17:07:56 UTC
[isis] 01/02: ISIS-2638: simplifies impersonateWithRoles
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e3203b524061b0a4f27b1527efa1b5bee94bdb72
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 23 17:58:25 2021 +0100
ISIS-2638: simplifies impersonateWithRoles
... taking advantage of recent fix so that we can now default param #1 based on param #0's arg
---
.../isis/applib/services/user/ImpersonateMenu.java | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java
index 8a419b9..f7a3d99 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenu.java
@@ -121,15 +121,9 @@ public class ImpersonateMenu {
@ActionLayout(sequence = "100.2", cssClassFa = "fa-mask")
public void impersonateWithRoles(
final String userName,
- @ParameterLayout(named = "Use user's roles?", labelPosition = LabelPosition.RIGHT)
- final boolean useUsersRoles,
final List<String> roleNames) {
- val rolesToUse = useUsersRoles
- ? impersonateMenuAdvisor().roleNamesFor(userName)
- : roleNames;
-
- this.userService.impersonateUser(userName, rolesToUse);
+ this.userService.impersonateUser(userName, roleNames);
this.messageService.informUser("Now impersonating " + userName);
}
@MemberSupport public boolean hideImpersonateWithRoles() {
@@ -141,18 +135,10 @@ public class ImpersonateMenu {
@MemberSupport public List<String> choices0ImpersonateWithRoles() {
return impersonateMenuAdvisor().allUserNames();
}
- @MemberSupport public boolean default1ImpersonateWithRoles() {
- return true;
- }
- @MemberSupport public boolean hide2ImpersonateWithRoles(final String userName, boolean useUsersRoles) {
- return useUsersRoles;
- }
- @MemberSupport public List<String> choices2ImpersonateWithRoles(final String userName, boolean useUsersRoles) {
+ @MemberSupport public List<String> choices1ImpersonateWithRoles(final String userName) {
return impersonateMenuAdvisor().allRoleNames();
}
- @MemberSupport public List<String> default2ImpersonateWithRoles(final String userName, boolean useUsersRoles) {
- // TODO: this is never called, unfortunately; ISIS-2666
- // TODO: and attempting to use Parameters fails; ISIS-2667
+ @MemberSupport public List<String> default1ImpersonateWithRoles(final String userName) {
return impersonateMenuAdvisor().roleNamesFor(userName);
}