X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FPersonUiProvider.java;h=8a22a10e55d0eddd417f2cf185ff5d538377f00b;hb=8514d43d70ddbb53a18f324ccc0fa0b704d70ed5;hp=f5f2610d888d1c84a5b94a330126bd81b1721e69;hpb=8339c61fea89f948b129a24834a53c7988c42df5;p=gpl%2Fargeo-suite.git

diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
index f5f2610..8a22a10 100644
--- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
+++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
@@ -6,19 +6,23 @@ import java.util.Map;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.QNamed;
-import org.argeo.api.acr.ldap.LdapAttrs;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
+import org.argeo.api.cms.directory.CmsGroup;
+import org.argeo.api.cms.directory.CmsUser;
+import org.argeo.api.cms.directory.CmsUserManager;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.HierarchyUnit.Type;
 import org.argeo.app.api.SuiteRole;
 import org.argeo.app.ui.SuiteMsg;
 import org.argeo.app.ui.SuiteStyle;
 import org.argeo.app.ui.SuiteUiUtils;
 import org.argeo.cms.CmsMsg;
-import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.CurrentUser;
 import org.argeo.cms.Localized;
 import org.argeo.cms.RoleNameUtils;
 import org.argeo.cms.SystemRole;
 import org.argeo.cms.auth.CmsRole;
-import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.swt.acr.SwtSection;
@@ -37,7 +41,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.osgi.service.useradmin.User;
 
 /** Edit a suite user. */
 public class PersonUiProvider implements SwtUiProvider {
@@ -50,27 +53,33 @@ public class PersonUiProvider implements SwtUiProvider {
 
 		main.setLayout(new GridLayout(2, false));
 
-		User user = context.adapt(User.class);
+		CmsUser user = context.adapt(CmsUser.class);
+
+		Content hierarchyUnitContent = context.getParent().getParent();
+		HierarchyUnit hierarchyUnit = hierarchyUnitContent.adapt(HierarchyUnit.class);
 
 		String roleContext = RoleNameUtils.getContext(user.getName());
 
-		if (context.hasContentClass(LdapObjs.person.qName())) {
+		if (context.hasContentClass(LdapObj.person.qName())) {
 
-			addFormLine(main, SuiteMsg.firstName, context, LdapAttrs.givenName);
-			addFormLine(main, SuiteMsg.lastName, context, LdapAttrs.sn);
-			addFormLine(main, SuiteMsg.email, context, LdapAttrs.mail);
+			addFormLine(main, SuiteMsg.firstName, context, LdapAttr.givenName);
+			addFormLine(main, SuiteMsg.lastName, context, LdapAttr.sn);
+			addFormLine(main, SuiteMsg.email, context, LdapAttr.mail);
 		}
 
-		if (context.hasContentClass(LdapObjs.posixAccount.qName())) {
-
-			SwtSection rolesSection = new SwtSection(main, SWT.NONE);
-			rolesSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
-			rolesSection.setLayout(new GridLayout(2, false));
-			List<String> roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName()));
-			addRoleCheckBox(rolesSection, SuiteMsg.coworkerRole, SuiteRole.coworker, roleContext, roles);
-			addRoleCheckBox(rolesSection, SuiteMsg.publisherRole, SuiteRole.publisher, roleContext, roles);
-			addRoleCheckBox(rolesSection, SuiteMsg.userAdminRole, CmsRole.userAdmin, roleContext, roles);
-
+		if (context.hasContentClass(LdapObj.posixAccount.qName())) {
+			if (hierarchyUnitContent.hasContentClass(LdapObj.organization)) {
+				SwtSection rolesSection = new SwtSection(main, SWT.NONE);
+				rolesSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
+				rolesSection.setLayout(new GridLayout(2, false));
+				List<String> roles = Arrays.asList(cmsUserManager.getUserRoles(user.getName()));
+				addRoleCheckBox(rolesSection, hierarchyUnit, user, SuiteMsg.coworkerRole, SuiteRole.coworker,
+						roleContext, roles);
+				addRoleCheckBox(rolesSection, hierarchyUnit, user, SuiteMsg.publisherRole, SuiteRole.publisher,
+						roleContext, roles);
+				addRoleCheckBox(rolesSection, hierarchyUnit, user, SuiteMsg.userAdminRole, CmsRole.userAdmin,
+						roleContext, roles);
+			}
 //			Composite facetsSection = new Composite(main, SWT.NONE);
 //			facetsSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
 //			facetsSection.setLayout(new GridLayout());
@@ -146,6 +155,7 @@ public class PersonUiProvider implements SwtUiProvider {
 					@Override
 					public void widgetDefaultSelected(SelectionEvent e) {
 						String editedTxt = text.getText();
+						content.put(attr, editedTxt);
 						text.stopEditing();
 						text.setText(editedTxt);
 						text.getParent().layout(new Control[] { text.getControl() });
@@ -156,8 +166,8 @@ public class PersonUiProvider implements SwtUiProvider {
 		});
 	}
 
-	private void addRoleCheckBox(SwtSection parent, Localized msg, SystemRole systemRole, String roleContext,
-			List<String> roles) {
+	private void addRoleCheckBox(SwtSection parent, HierarchyUnit hierarchyUnit, CmsUser user, Localized msg,
+			SystemRole systemRole, String roleContext, List<String> roles) {
 		Button radio = new Button(parent, SWT.CHECK);
 		radio.setSelection(false);
 		roles: for (String dn : roles) {
@@ -167,10 +177,25 @@ public class PersonUiProvider implements SwtUiProvider {
 			}
 		}
 
-		if (systemRole.equals(CmsRole.userAdmin))
-			radio.setEnabled(CurrentUser.implies(CmsRole.groupAdmin, roleContext));
-		else
+		if (systemRole.equals(CmsRole.userAdmin)) {
+			if (!CurrentUser.isUserContext(roleContext) && CurrentUser.implies(CmsRole.userAdmin, roleContext)) {
+				// a user admin cannot modify the user admins of their own context
+				radio.setEnabled(true);
+			} else {
+				radio.setEnabled(false);
+			}
+		} else {
 			radio.setEnabled(CurrentUser.implies(CmsRole.userAdmin, roleContext));
+		}
+
+		radio.addSelectionListener((Selected) (e) -> {
+			HierarchyUnit rolesHu = hierarchyUnit.getDirectChild(Type.ROLES);
+			CmsGroup roleGroup = cmsUserManager.getOrCreateSystemRole(rolesHu, systemRole.qName());
+			if (radio.getSelection())
+				cmsUserManager.addMember(roleGroup, user);
+			else
+				cmsUserManager.removeMember(roleGroup, user);
+		});
 
 		new Label(parent, 0).setText(msg.lead());