X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fparts%2FGroupMainPage.java;h=6987a217d807c06450aa927e36817dda7ce0a44d;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=e5c01b1435a6bae02a00abd84ac9432ee16880db;hpb=e0b74f76a331289a476fb3b9bac117385e7435fe;p=lgpl%2Fargeo-commons.git
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
index e5c01b143..6987a217d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
@@ -15,6 +15,11 @@
*/
package org.argeo.cms.ui.workbench.internal.useradmin.parts;
+import static org.argeo.cms.util.UserAdminUtils.setProperty;
+import static org.argeo.naming.LdapAttrs.businessCategory;
+import static org.argeo.naming.LdapAttrs.description;
+import static org.argeo.node.NodeInstance.WORKGROUP;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -23,10 +28,11 @@ import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.jcr.nodetype.NodeType;
-import javax.jcr.security.Privilege;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
import javax.transaction.UserTransaction;
+import org.argeo.cms.ArgeoNames;
import org.argeo.cms.CmsException;
import org.argeo.cms.ui.workbench.CmsWorkbenchStyles;
import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages;
@@ -37,7 +43,6 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.CommonNameLP;
import org.argeo.cms.ui.workbench.internal.useradmin.providers.MailLP;
import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP;
import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserFilter;
-import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
import org.argeo.cms.util.CmsUtils;
import org.argeo.cms.util.UserAdminUtils;
@@ -46,9 +51,7 @@ import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.eclipse.ui.parts.LdifUsersTable;
import org.argeo.jcr.JcrUtils;
import org.argeo.naming.LdapAttrs;
-import org.argeo.node.ArgeoNames;
-import org.argeo.node.NodeNames;
-import org.argeo.node.NodeTypes;
+import org.argeo.node.NodeInstance;
import org.argeo.node.NodeUtils;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ToolBarManager;
@@ -66,6 +69,7 @@ import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.dnd.TransferData;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Cursor;
@@ -96,10 +100,12 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
final static String ID = "GroupEditor.mainPage";
private final UserEditor editor;
- private UserAdminWrapper userAdminWrapper;
+ private final NodeInstance nodeInstance;
+ private final UserAdminWrapper userAdminWrapper;
private final Session session;
- public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper, Repository repository) {
+ public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper, Repository repository,
+ NodeInstance nodeInstance) {
super(editor, ID, "Main");
try {
session = repository.login();
@@ -108,6 +114,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
this.editor = (UserEditor) editor;
this.userAdminWrapper = userAdminWrapper;
+ this.nodeInstance = nodeInstance;
}
protected void createFormContent(final IManagedForm mf) {
@@ -130,31 +137,32 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
protected void appendOverviewPart(final Composite parent, final Group group) {
FormToolkit tk = getManagedForm().getToolkit();
Composite body = addSection(tk, parent);
- GridLayout layout = new GridLayout(5, false);
+ // GridLayout layout = new GridLayout(5, false);
+ GridLayout layout = new GridLayout(2, false);
body.setLayout(layout);
- final Text dnTxt = createLT(body, "DN", group.getName());
- dnTxt.setEnabled(false);
-
- final String cn = UserAdminUtils.getProperty(group, LdapAttrs.cn.name());
- final Text cnTxt = createLT(body, "Common Name", cn);
- cnTxt.setEnabled(false);
-
- final Link markAsWorkgroupLk = new Link(body, SWT.NONE);
- markAsWorkgroupLk.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
- // Label descLbl = new Label(body, SWT.LEAD);
- // descLbl.setText("Description");
- // descLbl.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false,
- // false));
- // final Text descTxt = new Text(body, SWT.LEAD | SWT.MULTI | SWT.WRAP
- // | SWT.BORDER);
- // GridData gd = EclipseUiUtils.fillAll();
- // gd.heightHint = 100;
- // descTxt.setLayoutData(gd);
+ String cn = UserAdminUtils.getProperty(group, LdapAttrs.cn.name());
+ createReadOnlyLT(body, "Name", cn);
+ // Text dnTxt = createReadOnlyLT(body, "DN", group.getName());
+ createReadOnlyLT(body, "Domain", UserAdminUtils.getDomainName(group));
+
+ // Description
+ Label descLbl = new Label(body, SWT.LEAD);
+ descLbl.setFont(EclipseUiUtils.getBoldFont(body));
+ descLbl.setText("Description");
+ descLbl.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, false, false, 2, 1));
+ final Text descTxt = new Text(body, SWT.LEAD | SWT.MULTI | SWT.WRAP | SWT.BORDER);
+ GridData gd = EclipseUiUtils.fillAll();
+ gd.heightHint = 50;
+ gd.horizontalSpan = 2;
+ descTxt.setLayoutData(gd);
+
+ // Mark as workgroup
+ Link markAsWorkgroupLk = new Link(body, SWT.NONE);
+ markAsWorkgroupLk.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
// create form part (controller)
- AbstractFormPart part = new SectionPart((Section) body.getParent()) {
+ final AbstractFormPart part = new SectionPart((Section) body.getParent()) {
private MainInfoListener listener;
@@ -172,20 +180,22 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
public void commit(boolean onSave) {
- // group.getProperties().put(LdapAttrs.description.name(),
- // descTxt.getText());
+ // group.getProperties().put(LdapAttrs.description.name(), descTxt.getText());
+ setProperty(group, description, descTxt.getText());
super.commit(onSave);
}
@Override
public void refresh() {
- dnTxt.setText(group.getName());
- cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
+ // dnTxt.setText(group.getName());
+ // cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
+ descTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.description.name()));
Node workgroupHome = NodeUtils.getGroupHome(session, cn);
if (workgroupHome == null)
markAsWorkgroupLk.setText("Mark as workgroup");
else
- markAsWorkgroupLk.setText(cn + " is already marked as being a workgroup");
+ markAsWorkgroupLk.setText("Configured as workgroup");
+ parent.layout(true, true);
super.refresh();
}
};
@@ -201,53 +211,35 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
if (confirmed) {
Node workgroupHome = NodeUtils.getGroupHome(session, cn);
if (workgroupHome != null)
- // already marked as workgroup, do nothing
- return;
- else {
- // Insure the session is clean to enable rollback
+ return; // already marked as workgroup, do nothing
+ else
try {
- if (session.hasPendingChanges())
- MessageDialog.openError(getSite().getShell(), "Cannot create home group home",
- "The current session is dirty. Please save and try again.");
- } catch (RepositoryException e2) {
- throw new CmsException("Cannot check session state", e2);
+ // improve transaction management
+ userAdminWrapper.beginTransactionIfNeeded();
+ nodeInstance.createWorkgroup(new LdapName(group.getName()));
+ setProperty(group, businessCategory, WORKGROUP);
+ userAdminWrapper.commitOrNotifyTransactionStateChange();
+ userAdminWrapper
+ .notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, group));
+ part.refresh();
+ } catch (InvalidNameException e1) {
+ throw new CmsException("Cannot create Workgroup for " + group.toString(), e1);
}
- try {
- // FIXME hardcoded base path
- String relPath = generateWorkgroupHomeRelPath(cn);
- Node newHome = JcrUtils.mkdirs(session.getNode("/groups"), relPath,
- NodeType.NT_UNSTRUCTURED);
- newHome.addMixin(NodeTypes.NODE_GROUP_HOME);
- newHome.setProperty(NodeNames.LDAP_CN, cn);
- session.save();
- JcrUtils.addPrivilege(session, newHome.getPath(), group.getName(), Privilege.JCR_ALL);
- session.save();
- } catch (RepositoryException e2) {
- JcrUtils.discardQuietly(session);
- throw new CmsException("Cannot check session state", e2);
- }
- }
+
}
}
});
- // ModifyListener defaultListener = editor.new FormPartML(part);
- // descTxt.addModifyListener(defaultListener);
+ ModifyListener defaultListener = editor.new FormPartML(part);
+ descTxt.addModifyListener(defaultListener);
getManagedForm().addPart(part);
}
- // FIXME finalise and centralise Workgroup home path management
- private String generateWorkgroupHomeRelPath(String cn) {
- // Dirty management of space and special characters
- String cleanedName = cn.replaceAll("[^a-zA-Z0-9]", "_");
- return JcrUtils.firstCharsToPath(cleanedName, 2) + '/' + cleanedName;
- }
-
- /** Filtered table with members. Has drag & drop ability */
+ /** Filtered table with members. Has drag and drop ability */
protected void appendMembersPart(Composite parent, Group group) {
-
FormToolkit tk = getManagedForm().getToolkit();
Section section = tk.createSection(parent, Section.TITLE_BAR);
+ section.setText("Members");
section.setLayoutData(EclipseUiUtils.fillAll());
Composite body = new Composite(section, SWT.NO_FOCUS);
@@ -256,7 +248,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
LdifUsersTable userTableViewerCmp = createMemberPart(body, group);
- SectionPart part = new GroupMembersPart(section, userTableViewerCmp, group);
+ SectionPart part = new GroupMembersPart(section, userTableViewerCmp);
getManagedForm().addPart(part);
addRemoveAbitily(part, userTableViewerCmp.getTableViewer(), group);
}
@@ -267,9 +259,10 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
// Define the displayed columns
List columnDefs = new ArrayList();
columnDefs.add(new ColumnDefinition(new RoleIconLP(), "", 0, 24));
- columnDefs.add(new ColumnDefinition(new CommonNameLP(), "Common Name", 150));
- columnDefs.add(new ColumnDefinition(new MailLP(), "Primary Mail", 150));
- columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 240));
+ columnDefs.add(new ColumnDefinition(new CommonNameLP(), "Name", 150));
+ columnDefs.add(new ColumnDefinition(new MailLP(), "Mail", 150));
+ // columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name",
+ // 240));
// Create and configure the table
LdifUsersTable userViewerCmp = new MyUserTableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL,
@@ -304,10 +297,12 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
@Override
protected List listFilteredElements(String filter) {
+ // reload user and set it in the editor
Group group = (Group) editor.getDisplayedUser();
Role[] roles = group.getMembers();
List users = new ArrayList();
userFilter.setSearchText(filter);
+ // userFilter.setShowSystemRole(true);
for (Role role : roles)
// if (role.getType() == Role.GROUP)
if (userFilter.select(null, null, role))
@@ -377,14 +372,14 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
// LOCAL CONTROLLERS
private class GroupMembersPart extends SectionPart {
private final LdifUsersTable userViewer;
- private final Group group;
+ // private final Group group;
private GroupChangeListener listener;
- public GroupMembersPart(Section section, LdifUsersTable userViewer, Group group) {
+ public GroupMembersPart(Section section, LdifUsersTable userViewer) {
super(section);
this.userViewer = userViewer;
- this.group = group;
+ // this.group = group;
}
@Override
@@ -402,7 +397,6 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
@Override
public void refresh() {
- getSection().setText("Members of group " + UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
userViewer.refresh();
super.refresh();
}
@@ -437,7 +431,6 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
@Override
public void drop(DropTargetEvent event) {
// TODO Is there an opportunity to perform the check before?
-
String newUserName = (String) event.data;
UserAdmin myUserAdmin = userAdminWrapper.getUserAdmin();
Role role = myUserAdmin.getRole(newUserName);
@@ -504,14 +497,27 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
/** Creates label and text. */
- private Text createLT(Composite parent, String label, String value) {
+ // private Text createLT(Composite parent, String label, String value) {
+ // FormToolkit toolkit = getManagedForm().getToolkit();
+ // Label lbl = toolkit.createLabel(parent, label);
+ // lbl.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, false, false));
+ // lbl.setFont(EclipseUiUtils.getBoldFont(parent));
+ // Text text = toolkit.createText(parent, value, SWT.BORDER);
+ // text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ // CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT);
+ // return text;
+ // }
+ //
+ Text createReadOnlyLT(Composite parent, String label, String value) {
FormToolkit toolkit = getManagedForm().getToolkit();
Label lbl = toolkit.createLabel(parent, label);
- lbl.setLayoutData(new GridData(SWT.END, SWT.CENTER, false, false));
+ lbl.setLayoutData(new GridData(SWT.LEAD, SWT.CENTER, false, false));
lbl.setFont(EclipseUiUtils.getBoldFont(parent));
- Text text = toolkit.createText(parent, value, SWT.BORDER);
+ Text text = toolkit.createText(parent, value, SWT.NONE);
text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ text.setEditable(false);
CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT);
return text;
}
+
}