Fix glitches
authorbsinou <bsinou@argeo.org>
Thu, 9 Feb 2017 21:46:56 +0000 (22:46 +0100)
committerbsinou <bsinou@argeo.org>
Thu, 9 Feb 2017 21:46:56 +0000 (22:46 +0100)
org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java
org.argeo.suite.workbench.rap/plugin.xml
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.gif [new file with mode: 0644]
org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.png [deleted file]

index 3ca8acfcfdbfada370159c35648c575e37edeff9..19067bdeccb049505a5e4af87b9d8baf1218ae00 100644 (file)
@@ -56,8 +56,6 @@ public class PeopleSuiteServiceImpl extends PeopleServiceImpl implements PeopleS
        // TODO Hard-coded model initialisation
        // To be cleaned once first init and config mechanisms have been implemented
        private final static String publicPath = "/public";
-       // FIXME to be added in NodeConstants
-       private final static String groupHomePath = "/groups";
        // FIXME Users must have read access on the jcr:system/jcr:versionStorage
        // node under JackRabbit to be able to manage versions
        private final static String jackRabbitVersionSystemPath = "/jcr:system";
@@ -67,13 +65,11 @@ public class PeopleSuiteServiceImpl extends PeopleServiceImpl implements PeopleS
                super.initialiseModel(adminSession);
 
                JcrUtils.mkdirs(adminSession, publicPath, NodeType.NT_UNSTRUCTURED);
-               JcrUtils.mkdirs(adminSession, groupHomePath, NodeType.NT_UNSTRUCTURED);
                if (adminSession.hasPendingChanges()) {
                        adminSession.save();
                        configureACL(adminSession);
                        log.info("Repository has been initialised with Argeo Suite model");
                }
-               initModelResources(adminSession);
        }
 
        // First draft of configuration of the people specific rights
@@ -85,8 +81,6 @@ public class PeopleSuiteServiceImpl extends PeopleServiceImpl implements PeopleS
 
                // Default configuration of the workspace
                JcrUtils.addPrivilege(session, "/", NodeConstants.ROLE_ADMIN, Privilege.JCR_ALL);
-               JcrUtils.addPrivilege(session, groupHomePath, NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_ALL);
-
                JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_USER, Privilege.JCR_READ);
                JcrUtils.addPrivilege(session, publicPath, "anonymous", Privilege.JCR_READ);
                JcrUtils.addPrivilege(session, publicPath, NodeConstants.ROLE_ANONYMOUS, Privilege.JCR_READ);
index bec219dad8db1a724359605a52e66c40097ebc62..1d7eab8f794f749008e07c5884b203cb8b2a2230 100644 (file)
@@ -81,7 +81,7 @@
                                        style="pulldown"
                                        label="Create"
                                        tooltip="Create a new object"
-                                       icon="theme/argeo-classic/icons/add.png"
+                                       icon="theme/argeo-classic/icons/add.gif"
                                        commandId="org.argeo.cms.ui.workbench.doNothing">
                                </command>
                                <command
index 7e51ede103ce8c1d35c2c49c761b30d2da421919..cc45bb2557c4de4463cefd43b9c520cb6c14c426 100644 (file)
@@ -91,8 +91,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                Node tagParent = getPeopleService().getResourceService().getTagLikeResourceParent(getSession(),
                                PeopleTypes.PEOPLE_MAILING_LIST);
                PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Mailing lists",
-                               PeopleTypes.PEOPLE_MAILING_LIST, ConnectJcrUtils.getPath(tagParent));
-
+                                       PeopleTypes.PEOPLE_MAILING_LIST, ConnectJcrUtils.getPath(tagParent));
                PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks", PeopleTypes.PEOPLE_TASK,
                                getPeopleService().getBasePath(null));
 
diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.gif b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.gif
new file mode 100644 (file)
index 0000000..252d7eb
Binary files /dev/null and b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.gif differ
diff --git a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.png b/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.png
deleted file mode 100644 (file)
index 4d07330..0000000
Binary files a/org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.png and /dev/null differ