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=2cfb7b72d17bb502b55c9854bca3bf382d3b0571;hb=c0995155ef2c0c48830e4ff22a9a7b15bc070cca;hp=6930b4e2a8cdcc5d0ad0eea2eac7ddc74b8a2cb4;hpb=932dbdce11c1a862b6a7babcb91bfec8e491e0b8;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 6930b4e..2cfb7b7 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
@@ -8,12 +8,15 @@ import org.argeo.api.acr.Content;
 import org.argeo.api.acr.QNamed;
 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.app.swt.ux.SuiteSwtUtils;
+import org.argeo.app.ux.SuiteMsg;
+import org.argeo.app.ux.SuiteStyle;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.CurrentUser;
 import org.argeo.cms.Localized;
@@ -53,6 +56,7 @@ public class PersonUiProvider implements SwtUiProvider {
 		CmsUser user = context.adapt(CmsUser.class);
 
 		Content hierarchyUnitContent = context.getParent().getParent();
+		HierarchyUnit hierarchyUnit = hierarchyUnitContent.adapt(HierarchyUnit.class);
 
 		String roleContext = RoleNameUtils.getContext(user.getName());
 
@@ -69,9 +73,12 @@ public class PersonUiProvider implements SwtUiProvider {
 				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);
+				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));
@@ -88,12 +95,12 @@ public class PersonUiProvider implements SwtUiProvider {
 				changePasswordSection.setLayout(new GridLayout(2, false));
 //				SuiteUiUtils.addFormLabel(changePasswordSection, CmsMsg.changePassword)
 //						.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, false, false, 2, 1));
-				SuiteUiUtils.addFormLabel(changePasswordSection, CmsMsg.newPassword);
-				Text newPasswordT = SuiteUiUtils.addFormTextField(changePasswordSection, null, null,
+				SuiteSwtUtils.addFormLabel(changePasswordSection, CmsMsg.newPassword);
+				Text newPasswordT = SuiteSwtUtils.addFormTextField(changePasswordSection, null, null,
 						SWT.PASSWORD | SWT.BORDER);
 				newPasswordT.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-				SuiteUiUtils.addFormLabel(changePasswordSection, CmsMsg.repeatNewPassword);
-				Text repeatNewPasswordT = SuiteUiUtils.addFormTextField(changePasswordSection, null, null,
+				SuiteSwtUtils.addFormLabel(changePasswordSection, CmsMsg.repeatNewPassword);
+				Text repeatNewPasswordT = SuiteSwtUtils.addFormTextField(changePasswordSection, null, null,
 						SWT.PASSWORD | SWT.BORDER);
 				repeatNewPasswordT.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 				Button apply = new Button(changePasswordSection, SWT.FLAT);
@@ -120,7 +127,7 @@ public class PersonUiProvider implements SwtUiProvider {
 	}
 
 	private void addFormLine(SwtSection parent, Localized msg, Content content, QNamed attr) {
-		SuiteUiUtils.addFormLabel(parent, msg.lead());
+		SuiteSwtUtils.addFormLabel(parent, msg.lead());
 		EditableText text = new EditableText(parent, SWT.SINGLE | SWT.FLAT);
 		text.setLayoutData(CmsSwtUtils.fillWidth());
 		text.setStyle(SuiteStyle.simpleInput);
@@ -148,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() });
@@ -158,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) {
@@ -179,6 +187,16 @@ public class PersonUiProvider implements SwtUiProvider {
 		} 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());
 
 	}