X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FUsersEntryArea.java;h=c31159b41e91a06ebd6bfc93cba608c2c5598708;hb=c6b561fc1d45dd5abcbf86f99ae546bdc3b42b8d;hp=04cccf7b89f64dff6b43811bf248e643af155b74;hpb=99a029d144e7aab7f8b5a9ac3a2c4383cae4a6f5;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 04cccf7..c31159b 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,13 +9,15 @@ 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.CmsTheme; -import org.argeo.api.cms.CmsView; +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.auth.CmsRole; +import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.jcr.acr.JcrContent; +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; @@ -23,16 +25,15 @@ 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; +import org.argeo.cms.ux.widgets.Column; import org.argeo.cms.ux.widgets.HierarchicalPart; import org.argeo.cms.ux.widgets.TabularPart; -import org.argeo.osgi.useradmin.FunctionalGroup; -import org.argeo.osgi.useradmin.HierarchyUnit; -import org.argeo.osgi.useradmin.Organization; -import org.argeo.osgi.useradmin.Person; import org.argeo.osgi.useradmin.UserDirectory; import org.argeo.util.LangUtils; -import org.argeo.util.naming.LdapAttrs; -import org.argeo.util.naming.LdapObjs; +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.eclipse.jface.window.Window; import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.SWT; @@ -46,7 +47,6 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swt.widgets.TreeItem; -import org.osgi.service.useradmin.Group; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; @@ -59,7 +59,7 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { @Override public Control createUiPart(Composite parent, Content context) { - CmsTheme theme = CmsSwtUtils.getCmsTheme(parent); + CmsSwtTheme theme = CmsSwtUtils.getCmsTheme(parent); CmsView cmsView = CmsSwtUtils.getCmsView(parent); parent.setLayout(new GridLayout()); @@ -79,24 +79,35 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { protected void refreshRootItem(TreeItem item) { int index = getTree().indexOf(item); UserDirectory directory = (UserDirectory) directories.get(index); - item.setData(directory); + List visible = new ArrayList<>(); +// item.setData(directory); item.setText(directory.getName()); - - item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits(true))); +// if (CmsRole.userAdmin.implied(CurrentUser.getCmsSession().getSubject(), directory.getGlobalId())) { +// visible.addAll(directory.getRootHierarchyUnits(true)); +// +// } else { + for (HierarchyUnit hu : directory.getDirectHierarchyUnits(true)) { + if (CurrentUser.implies(CmsRole.userAdmin, hu.getContext())) { + visible.add(hu); + } + } +// } + item.setData(visible); + item.setItemCount(visible.size()); } @Override protected void refreshItem(TreeItem parentItem, TreeItem item) { int index = getTree().indexOf(item); Iterable children; - if (parentItem.getData() instanceof UserDirectory) - children = ((UserDirectory) parentItem.getData()).getRootHierarchyUnits(true); + if (parentItem.getData() instanceof Iterable) + children = (Iterable) parentItem.getData(); else - children = ((HierarchyUnit) parentItem.getData()).getFunctionalHierachyUnits(); + children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits(true); HierarchyUnit child = LangUtils.getAt(children, index); item.setData(child); item.setText(child.getHierarchyUnitName()); - item.setItemCount(LangUtils.size(child.getFunctionalHierachyUnits())); + item.setItemCount(LangUtils.size(child.getDirectHierachyUnits(true))); } @Override @@ -117,11 +128,11 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { item.setText(role.getName()); Image icon; if (role instanceof Organization) { - icon = SuiteIcon.organisation.getSmallIcon(theme); + icon = theme.getSmallIcon(SuiteIcon.organisation); } else if (role instanceof FunctionalGroup) { - icon = SuiteIcon.group.getSmallIcon(theme); + icon = theme.getSmallIcon(SuiteIcon.group); } else if (role instanceof Person) { - icon = SuiteIcon.person.getSmallIcon(theme); + icon = theme.getSmallIcon(SuiteIcon.person); } else { icon = null; } @@ -134,9 +145,13 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { HierarchyUnit hu = (HierarchyUnit) getInput(); if (hu == null) return 0; - for (HierarchyUnit directChild : hu.getDirectHierachyUnits()) { + UserDirectory ud = (UserDirectory) hu.getDirectory(); + for (HierarchyUnit directChild : hu.getDirectHierachyUnits(false)) { if (!directChild.isFunctional()) { - roles.addAll(directChild.getHierarchyUnitRoles(null, false)); + for (Role r : ud.getHierarchyUnitRoles(directChild, null, false)) { + if (r instanceof Person || r instanceof Organization) + roles.add(r); + } } } // roles = hu.getHierarchyUnitRoles(null, false); @@ -144,6 +159,13 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { } }; + usersView.addColumn(new Column() { + + @Override + public String getText(User model) { + return model.toString(); + } + }); Composite bottom = new Composite(parent, SWT.NONE); bottom.setLayoutData(CmsSwtUtils.fillWidth()); @@ -153,10 +175,11 @@ public class UsersEntryArea implements SwtUiProvider, CmsUiProvider { ToolItem deleteItem = new ToolItem(bottomToolBar, SWT.FLAT); deleteItem.setEnabled(false); // CmsUiUtils.style(deleteItem, SuiteStyle.recentItems); - deleteItem.setImage(SuiteIcon.delete.getSmallIcon(theme)); + deleteItem.setImage(theme.getSmallIcon(SuiteIcon.delete)); ToolItem addItem = new ToolItem(bottomToolBar, SWT.FLAT); - addItem.setImage(SuiteIcon.add.getSmallIcon(theme)); + addItem.setImage(theme.getSmallIcon(SuiteIcon.add)); + sashForm.setWeights(new int[] { 30, 70 }); // CONTROLLER directoriesView.onSelected((o) -> { if (o instanceof HierarchyUnit) {