X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2Fpeople%2FPersonUiProvider.java;h=d1dfd7861ff7ad85fd35d981c24dfdf99876a55f;hb=f1b87af2e0de38f1f49ab8fe68f9988018914811;hp=17dc29bd2c5d45b0bd7abc41e19f0cda1dfadb5f;hpb=01513d5ffb8cf1f1a7c230a9983a5943dc7e13f6;p=gpl%2Fargeo-suite.git diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java index 17dc29b..d1dfd78 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java @@ -12,11 +12,10 @@ import org.argeo.cms.CmsUserManager; import org.argeo.cms.Localized; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.acr.SwtSection; +import org.argeo.cms.swt.acr.SwtUiProvider; import org.argeo.cms.swt.widgets.EditableText; -import org.argeo.cms.ui.CmsUiProvider; import org.argeo.util.naming.LdapAttrs; import org.argeo.util.naming.LdapObjs; -import org.argeo.util.naming.QNamed; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; @@ -31,7 +30,7 @@ import org.eclipse.swt.widgets.Text; import org.osgi.service.useradmin.User; /** Edit a suite user. */ -public class PersonUiProvider implements CmsUiProvider { +public class PersonUiProvider implements SwtUiProvider { private String[] availableRoles; private CmsUserManager cmsUserManager; @@ -62,6 +61,16 @@ public class PersonUiProvider implements CmsUiProvider { if (roles.contains(role)) radio.setSelection(true); } + +// Composite facetsSection = new Composite(main, SWT.NONE); +// facetsSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); +// facetsSection.setLayout(new GridLayout()); +// if (context.hasContentClass(LdapObjs.groupOfNames.qName())) { +// String[] members = context.attr(LdapAttrs.member.qName()).split("\n"); +// for (String member : members) { +// new Label(facetsSection, SWT.NONE).setText(member); +// } +// } } // if (user instanceof Group) { @@ -111,12 +120,15 @@ public class PersonUiProvider implements CmsUiProvider { return main; } - private void addFormLine(SwtSection parent, Localized msg, Content context, QNamed attr) { + private void addFormLine(SwtSection parent, Localized msg, Content context, LdapAttrs attr) { SuiteUiUtils.addFormLabel(parent, msg.lead()); EditableText text = new EditableText(parent, SWT.SINGLE | SWT.FLAT); text.setLayoutData(CmsSwtUtils.fillWidth()); text.setStyle(SuiteStyle.simpleInput); - text.setText(context.attr(attr.qName())); + String txt = context.attr(attr.qName()); + if (txt == null) // FIXME understand why email is not found in IPA + txt = ""; + text.setText(txt); text.setMouseListener(new MouseAdapter() { @Override