X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersEntryArea.java;h=355f5202732422fe8e71b4a19c001daa25317076;hb=9c3baf6fd38128aea09679be4c0b54d23cf7a876;hp=c31159b41e91a06ebd6bfc93cba608c2c5598708;hpb=c6b561fc1d45dd5abcbf86f99ae546bdc3b42b8d;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java index c31159b..355f520 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/UsersEntryArea.java @@ -9,19 +9,22 @@ import javax.jcr.RepositoryException; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.ContentSession; +import org.argeo.api.cms.ux.CmsIcon; import org.argeo.api.cms.ux.CmsView; import org.argeo.app.ui.SuiteEvent; import org.argeo.app.ui.SuiteIcon; import org.argeo.app.ui.dialogs.NewUserWizard; import org.argeo.cms.CmsUserManager; +import org.argeo.cms.acr.ContentUtils; import org.argeo.cms.auth.CmsRole; import org.argeo.cms.auth.CurrentUser; +import org.argeo.cms.auth.UserAdminUtils; import org.argeo.cms.jcr.acr.JcrContent; +import org.argeo.cms.jface.dialog.CmsWizardDialog; import org.argeo.cms.swt.CmsSwtTheme; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.Selected; import org.argeo.cms.swt.acr.SwtUiProvider; -import org.argeo.cms.swt.dialogs.CmsWizardDialog; import org.argeo.cms.swt.widgets.SwtHierarchicalPart; import org.argeo.cms.swt.widgets.SwtTabularPart; import org.argeo.cms.ui.CmsUiProvider; @@ -30,20 +33,17 @@ import org.argeo.cms.ux.widgets.HierarchicalPart; import org.argeo.cms.ux.widgets.TabularPart; import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.LangUtils; -import org.argeo.util.directory.FunctionalGroup; import org.argeo.util.directory.HierarchyUnit; -import org.argeo.util.directory.Organization; -import org.argeo.util.directory.Person; +import org.argeo.util.naming.LdapAttrs; +import org.argeo.util.naming.LdapObjs; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; -import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swt.widgets.TreeItem; @@ -64,7 +64,6 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { parent.setLayout(new GridLayout()); ContentSession contentSession = contentRepository.get(); - SashForm sashForm = new SashForm(parent, SWT.VERTICAL); CmsSwtUtils.fill(sashForm); @@ -118,26 +117,30 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { }; TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) { - List roles = new ArrayList<>(); + List roles = new ArrayList<>(); @Override - protected void refreshItem(TableItem item) { - int index = getTable().indexOf(item); - User role = (User) roles.get(index); - item.setData(role); - item.setText(role.getName()); - Image icon; - if (role instanceof Organization) { - icon = theme.getSmallIcon(SuiteIcon.organisation); - } else if (role instanceof FunctionalGroup) { - icon = theme.getSmallIcon(SuiteIcon.group); - } else if (role instanceof Person) { - icon = theme.getSmallIcon(SuiteIcon.person); - } else { - icon = null; - } - item.setImage(icon); + protected Object getData(int row) { + return roles.get(row); } +// @Override +// protected void refreshItem(TableItem item) { +// int index = getTable().indexOf(item); +// User role = (User) roles.get(index); +// item.setData(role); +// item.setText(role.getName()); +// Image icon; +// if (role instanceof Organization) { +// icon = theme.getSmallIcon(SuiteIcon.organisation); +// } else if (role instanceof FunctionalGroup) { +// icon = theme.getSmallIcon(SuiteIcon.group); +// } else if (role instanceof Person) { +// icon = theme.getSmallIcon(SuiteIcon.person); +// } else { +// icon = null; +// } +// item.setImage(icon); +// } @Override protected int getItemCount() { @@ -149,8 +152,10 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { for (HierarchyUnit directChild : hu.getDirectHierachyUnits(false)) { if (!directChild.isFunctional()) { for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) { - if (r instanceof Person || r instanceof Organization) - roles.add(r); + Content content = ContentUtils.roleToContent(cmsUserManager, contentSession, r); + // if (r instanceof Person || r instanceof Organization) + if (content.hasContentClass(LdapObjs.inetOrgPerson.qName(), LdapObjs.organization.qName())) + roles.add(content); } } } @@ -159,14 +164,41 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { } }; - usersView.addColumn(new Column() { + usersView.addColumn(new Column() { + + @Override + public String getText(Content role) { + if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) + return UserAdminUtils.getUserDisplayName(role.adapt(User.class)); + else if (role.isContentClass(LdapObjs.organization.qName())) + return role.attr(LdapAttrs.o.qName()); + else if (role.isContentClass(LdapObjs.groupOfNames.qName())) + return role.attr(LdapAttrs.cn.qName()); + else + return null; + } @Override - public String getText(User model) { - return model.toString(); + public CmsIcon getIcon(Content role) { + if (role.isContentClass(LdapObjs.inetOrgPerson.qName())) + return SuiteIcon.person; + else if (role.isContentClass(LdapObjs.organization.qName())) + return SuiteIcon.organisation; + else if (role.isContentClass(LdapObjs.groupOfNames.qName())) + return SuiteIcon.group; + else + return null; } + + @Override + public int getWidth() { + return 300; + } + }); + usersView.addColumn((Column) (role) -> role.attr(LdapAttrs.mail.qName())); + // toolbar Composite bottom = new Composite(parent, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); bottom.setLayout(CmsSwtUtils.noSpaceGridLayout()); @@ -180,6 +212,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); sashForm.setWeights(new int[] { 30, 70 }); + // CONTROLLER directoriesView.onSelected((o) -> { if (o instanceof HierarchyUnit) { @@ -188,7 +221,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { }); usersView.onSelected((o) -> { - User user = (User) o; + Content user = (Content) o; if (user != null) { cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(user)); deleteItem.setEnabled(true); @@ -198,7 +231,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { }); usersView.onAction((o) -> { - User user = (User) o; + Content user = (Content) o; if (user != null) { cmsView.sendEvent(SuiteEvent.openNewPart.topic(), SuiteEvent.eventProperties(user)); } @@ -220,8 +253,8 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { return sashForm; } -// private String getUserProperty(Object element, String key) { -// Object value = ((User) element).getProperties().get(key); +// static String getProperty(Role role, LdapAttrs attr) { +// Object value = role.getProperties().get(attr.name()); // return value != null ? value.toString() : null; // }