X-Git-Url: https://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=6fe6e1ab29466f71b3334ccb011878a47f18f88f;hpb=d53071455192a97322935a911c9fbbfd92084912;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 6fe6e1ab2..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,13 +15,26 @@
*/
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;
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+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;
import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor.GroupChangeListener;
@@ -30,14 +43,16 @@ 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;
import org.argeo.eclipse.ui.ColumnDefinition;
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.NodeInstance;
+import org.argeo.node.NodeUtils;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -55,11 +70,14 @@ 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;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.ToolBar;
@@ -82,15 +100,21 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
final static String ID = "GroupEditor.mainPage";
private final UserEditor editor;
- private UserAdminWrapper userAdminWrapper;
-
- // Local configuration
- private final int PRE_TITLE_INDENT = 10;
+ private final NodeInstance nodeInstance;
+ private final UserAdminWrapper userAdminWrapper;
+ private final Session session;
- public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper) {
+ public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper, Repository repository,
+ NodeInstance nodeInstance) {
super(editor, ID, "Main");
+ try {
+ session = repository.login();
+ } catch (RepositoryException e) {
+ throw new CmsException("Cannot retrieve session of in MainGroupPage constructor", e);
+ }
this.editor = (UserEditor) editor;
this.userAdminWrapper = userAdminWrapper;
+ this.nodeInstance = nodeInstance;
}
protected void createFormContent(final IManagedForm mf) {
@@ -103,39 +127,49 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
appendMembersPart(body, group);
}
+ @Override
+ public void dispose() {
+ JcrUtils.logoutQuietly(session);
+ super.dispose();
+ }
+
/** Creates the general section */
protected void appendOverviewPart(final Composite parent, final Group group) {
FormToolkit tk = getManagedForm().getToolkit();
- Composite body = addSection(tk, parent, "Main information");
+ Composite body = addSection(tk, parent);
+ // 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 Text cnTxt = createLT(body, "Common Name",
- UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
- cnTxt.setEnabled(false);
+ 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.RIGHT, SWT.TOP, false, false));
- final Text descTxt = new Text(body, SWT.LEAD | SWT.MULTI | SWT.WRAP
- | SWT.BORDER);
+ 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 = 100;
+ 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;
@Override
public void initialize(IManagedForm form) {
super.initialize(form);
- listener = editor.new MainInfoListener(parent.getDisplay(),
- this);
+ listener = editor.new MainInfoListener(parent.getDisplay(), this);
userAdminWrapper.addListener(listener);
}
@@ -145,38 +179,67 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
super.dispose();
}
- @SuppressWarnings("unchecked")
public void commit(boolean onSave) {
- group.getProperties().put(LdapAttrs.description.name(),
- descTxt.getText());
- // Enable common name ?
- // editor.setProperty(UserAdminConstants.KEY_CN,
- // email.getText());
+ // group.getProperties().put(LdapAttrs.description.name(), descTxt.getText());
+ setProperty(group, description, descTxt.getText());
super.commit(onSave);
}
@Override
public void refresh() {
- refreshFormTitle(group);
- dnTxt.setText(group.getName());
- cnTxt.setText(UserAdminUtils.getProperty(group,
- LdapAttrs.cn.name()));
- descTxt.setText(UserAdminUtils.getProperty(group,
- LdapAttrs.description.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("Configured as workgroup");
+ parent.layout(true, true);
super.refresh();
}
};
+ markAsWorkgroupLk.addSelectionListener(new SelectionAdapter() {
+ private static final long serialVersionUID = -6439340898096365078L;
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+
+ boolean confirmed = MessageDialog.openConfirm(parent.getShell(), "Mark as workgroup",
+ "Are you sure you want to mark " + cn + " as being a workgroup? ");
+ if (confirmed) {
+ Node workgroupHome = NodeUtils.getGroupHome(session, cn);
+ if (workgroupHome != null)
+ return; // already marked as workgroup, do nothing
+ else
+ try {
+ // 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);
+ }
+
+ }
+ }
+ });
+
ModifyListener defaultListener = editor.new FormPartML(part);
descTxt.addModifyListener(defaultListener);
getManagedForm().addPart(part);
}
- /** 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);
@@ -185,8 +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);
}
@@ -197,15 +259,14 @@ 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, userAdminWrapper.getUserAdmin());
+ LdifUsersTable userViewerCmp = new MyUserTableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL,
+ userAdminWrapper.getUserAdmin());
userViewerCmp.setColumnDefinitions(columnDefs);
userViewerCmp.populate(true, false);
@@ -217,8 +278,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
int operations = DND.DROP_COPY | DND.DROP_MOVE;
Transfer[] tt = new Transfer[] { TextTransfer.getInstance() };
userViewer.addDropSupport(operations, tt,
- new GroupDropListener(userAdminWrapper, userViewerCmp,
- (Group) editor.getDisplayedUser()));
+ new GroupDropListener(userAdminWrapper, userViewerCmp, (Group) editor.getDisplayedUser()));
return userViewerCmp;
}
@@ -229,8 +289,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
private final UserFilter userFilter;
- public MyUserTableViewer(Composite parent, int style,
- UserAdmin userAdmin) {
+ public MyUserTableViewer(Composite parent, int style, UserAdmin userAdmin) {
super(parent, style, true);
userFilter = new UserFilter();
@@ -238,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))
@@ -250,13 +311,11 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
}
- private void addRemoveAbitily(SectionPart sectionPart,
- TableViewer userViewer, Group group) {
+ private void addRemoveAbitily(SectionPart sectionPart, TableViewer userViewer, Group group) {
Section section = sectionPart.getSection();
ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
ToolBar toolbar = toolBarManager.createControl(section);
- final Cursor handCursor = new Cursor(section.getDisplay(),
- SWT.CURSOR_HAND);
+ final Cursor handCursor = new Cursor(section.getDisplay(), SWT.CURSOR_HAND);
toolbar.setCursor(handCursor);
toolbar.addDisposeListener(new DisposeListener() {
private static final long serialVersionUID = 3882131405820522925L;
@@ -268,8 +327,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
});
- Action action = new RemoveMembershipAction(userViewer, group,
- "Remove selected items from this group",
+ Action action = new RemoveMembershipAction(userViewer, group, "Remove selected items from this group",
SecurityAdminImages.ICON_REMOVE_DESC);
toolBarManager.add(action);
toolBarManager.update(true);
@@ -282,8 +340,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
private final TableViewer userViewer;
private final Group group;
- RemoveMembershipAction(TableViewer userViewer, Group group,
- String name, ImageDescriptor img) {
+ RemoveMembershipAction(TableViewer userViewer, Group group, String name, ImageDescriptor img) {
super(name, img);
this.userViewer = userViewer;
this.group = group;
@@ -308,30 +365,27 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
group.removeMember(user);
}
userAdminWrapper.commitOrNotifyTransactionStateChange();
- userAdminWrapper.notifyListeners(new UserAdminEvent(null,
- UserAdminEvent.ROLE_CHANGED, group));
+ userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, group));
}
}
// 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
public void initialize(IManagedForm form) {
super.initialize(form);
- listener = editor.new GroupChangeListener(userViewer.getDisplay(),
- GroupMembersPart.this);
+ listener = editor.new GroupChangeListener(userViewer.getDisplay(), GroupMembersPart.this);
userAdminWrapper.addListener(listener);
}
@@ -343,11 +397,6 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
@Override
public void refresh() {
- refreshFormTitle(group);
- getSection().setText(
- "Members of group "
- + UserAdminUtils.getProperty(group,
- LdapAttrs.cn.name()));
userViewer.refresh();
super.refresh();
}
@@ -364,8 +413,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
// private final LdifUsersTable myUserViewerCmp;
private final Group myGroup;
- public GroupDropListener(UserAdminWrapper userAdminWrapper,
- LdifUsersTable userTableViewerCmp, Group group) {
+ public GroupDropListener(UserAdminWrapper userAdminWrapper, LdifUsersTable userTableViewerCmp, Group group) {
super(userTableViewerCmp.getTableViewer());
this.userAdminWrapper = userAdminWrapper;
this.myGroup = group;
@@ -373,8 +421,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
@Override
- public boolean validateDrop(Object target, int operation,
- TransferData transferType) {
+ public boolean validateDrop(Object target, int operation, TransferData transferType) {
// Target is always OK in a list only view
// TODO check if not a string
boolean validDrop = true;
@@ -384,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);
@@ -393,8 +439,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
Shell shell = getViewer().getControl().getShell();
// Sanity checks
if (myGroup == newGroup) { // Equality
- MessageDialog.openError(shell, "Forbidden addition ",
- "A group cannot be a member of itself.");
+ MessageDialog.openError(shell, "Forbidden addition ", "A group cannot be a member of itself.");
return;
}
@@ -403,8 +448,7 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
List myMemberships = editor.getFlatGroups(myGroup);
if (myMemberships.contains(newGroup)) {
MessageDialog.openError(shell, "Forbidden addition: cycle",
- "Cannot add " + newUserName + " to group " + myName
- + ". This would create a cycle");
+ "Cannot add " + newUserName + " to group " + myName + ". This would create a cycle");
return;
}
@@ -412,30 +456,25 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
List newGroupMemberships = editor.getFlatGroups(newGroup);
if (newGroupMemberships.contains(myGroup)) {
MessageDialog.openError(shell, "Forbidden addition",
- "Cannot add " + newUserName + " to group " + myName
- + ", this membership already exists");
+ "Cannot add " + newUserName + " to group " + myName + ", this membership already exists");
return;
}
userAdminWrapper.beginTransactionIfNeeded();
myGroup.addMember(newGroup);
userAdminWrapper.commitOrNotifyTransactionStateChange();
- userAdminWrapper.notifyListeners(new UserAdminEvent(null,
- UserAdminEvent.ROLE_CHANGED, myGroup));
+ userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, myGroup));
} else if (role.getType() == Role.USER) {
// TODO check if the group is already member of this group
- UserTransaction transaction = userAdminWrapper
- .beginTransactionIfNeeded();
+ UserTransaction transaction = userAdminWrapper.beginTransactionIfNeeded();
User user = (User) role;
myGroup.addMember(user);
if (UserAdminWrapper.COMMIT_ON_SAVE)
try {
transaction.commit();
} catch (Exception e) {
- throw new CmsException("Cannot commit transaction "
- + "after user group membership update", e);
+ throw new CmsException("Cannot commit transaction " + "after user group membership update", e);
}
- userAdminWrapper.notifyListeners(new UserAdminEvent(null,
- UserAdminEvent.ROLE_CHANGED, myGroup));
+ userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, myGroup));
}
super.drop(event);
}
@@ -448,17 +487,9 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
// LOCAL HELPERS
- private void refreshFormTitle(Group group) {
- getManagedForm().getForm().setText(
- UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
- }
-
- private Composite addSection(FormToolkit tk, Composite parent, String title) {
- Section section = tk.createSection(parent, Section.TITLE_BAR);
- GridData gd = EclipseUiUtils.fillWidth();
- gd.verticalAlignment = PRE_TITLE_INDENT;
- section.setLayoutData(gd);
- section.setText(title);
+ private Composite addSection(FormToolkit tk, Composite parent) {
+ Section section = tk.createSection(parent, SWT.NO_FOCUS);
+ section.setLayoutData(EclipseUiUtils.fillWidth());
Composite body = tk.createComposite(section, SWT.WRAP);
body.setLayoutData(EclipseUiUtils.fillAll());
section.setClient(body);
@@ -466,12 +497,27 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
}
/** Creates label and text. */
- private Text createLT(Composite body, 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(body, label);
- lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
- Text text = toolkit.createText(body, value, SWT.BORDER);
+ 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.NONE);
text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ text.setEditable(false);
+ CmsUtils.style(text, CmsWorkbenchStyles.WORKBENCH_FORM_TEXT);
return text;
}
+
}