import org.argeo.api.acr.Content;
import org.argeo.api.acr.ContentRepository;
-import org.argeo.api.cms.CmsTheme;
-import org.argeo.api.cms.CmsView;
+import org.argeo.api.acr.ContentSession;
+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;
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.HierarchyUnit;
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.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;
@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());
+ ContentSession contentSession = contentRepository.get();
+
SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
CmsSwtUtils.fill(sashForm);
protected void refreshRootItem(TreeItem item) {
int index = getTree().indexOf(item);
UserDirectory directory = (UserDirectory) directories.get(index);
- item.setData(directory);
+ List<HierarchyUnit> visible = new ArrayList<>();
+// item.setData(directory);
item.setText(directory.getName());
-
- item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits()));
+// 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<HierarchyUnit> children;
- if (parentItem.getData() instanceof UserDirectory)
- children = ((UserDirectory) parentItem.getData()).getRootHierarchyUnits();
+ if (parentItem.getData() instanceof Iterable)
+ children = (Iterable<HierarchyUnit>) parentItem.getData();
else
- children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits();
+ children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits(true);
HierarchyUnit child = LangUtils.getAt(children, index);
item.setData(child);
item.setText(child.getHierarchyUnitName());
- item.setItemCount(LangUtils.size(child.getDirectHierachyUnits()));
+ item.setItemCount(LangUtils.size(child.getDirectHierachyUnits(true)));
}
@Override
};
TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) {
- List<? extends Role> roles;
+ List<Role> roles = new ArrayList<>();
@Override
protected void refreshItem(TableItem 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() {
+ roles.clear();
HierarchyUnit hu = (HierarchyUnit) getInput();
if (hu == null)
return 0;
- roles = hu.getHierarchyUnitRoles(null, false);
+ UserDirectory ud = (UserDirectory) hu.getDirectory();
+ 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);
+ }
+ }
+ }
+ // roles = hu.getHierarchyUnitRoles(null, false);
return roles.size();
}
};
+ usersView.addColumn(new Column<User>() {
+
+ @Override
+ public String getText(User model) {
+ return model.toString();
+ }
+ });
Composite bottom = new Composite(parent, SWT.NONE);
bottom.setLayoutData(CmsSwtUtils.fillWidth());
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) {
// private String getUserProperty(Object element, String key) {
// Object value = ((User) element).getProperties().get(key);
// return value != null ? value.toString() : null;
+// }
+
+// private boolean isOrganisation(Role role) {
+// String[] objectClasses = role.getProperties().get(LdapAttrs.objectClasses.name()).toString().split("\\n");
+// for (String objectClass : objectClasses) {
+// if (LdapObjs.organization.name().equalsIgnoreCase(objectClass))
+// return true;
+// }
+// return false;
// }
public void setCmsUserManager(CmsUserManager cmsUserManager) {
projects / gpl / argeo-suite.git / blobdiff