From 208e94c34feb497d1308d0802168e55266fa38b5 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Mon, 18 Jul 2016 22:40:28 +0000 Subject: [PATCH] Fix glitches git-svn-id: https://svn.argeo.org/commons/trunk@9049 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/org/argeo/eclipse/ui/workbench/users/UserLP.java | 5 ++--- .../security/ui/admin/internal/providers/UserFilter.java | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java index 157beff2c..450702373 100644 --- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java +++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java @@ -39,8 +39,7 @@ class UserLP extends ColumnLabelProvider { // Self as bold try { LdapName selfUserName = UsersUtils.getLdapName(); - String userName = UsersUtils.getProperty((User) element, - LdifName.dn.name()); + String userName = ((User) element).getName(); LdapName userLdapName = new LdapName(userName); if (userLdapName.equals(selfUserName)) { if (bold == null) @@ -66,7 +65,7 @@ class UserLP extends ColumnLabelProvider { public Image getImage(Object element) { if (COL_ICON.equals(currType)) { User user = (User) element; - String dn = (String) user.getProperties().get(LdifName.dn.name()); + String dn = user.getName(); if (dn.endsWith(UsersUtils.ROLES_BASEDN)) return UsersImages.ICON_ROLE; else if (user.getType() == Role.GROUP) diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java index 0b473446d..5f753d1c3 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java @@ -35,7 +35,6 @@ public class UserFilter extends ViewerFilter { @Override public boolean select(Viewer viewer, Object parentElement, Object element) { User user = (User) element; - if (!showSystemRole && user.getName().matches( ".*(" + AuthConstants.ROLES_BASEDN + ")")) -- 2.30.2