From e7ec976e33b8893b93b953c69c816286d7a118c7 Mon Sep 17 00:00:00 2001
From: bsinou <bsinou@argeo.org>
Date: Thu, 9 Feb 2017 22:46:56 +0100
Subject: [PATCH] Fix glitches

---
 .../suite/people/PeopleSuiteServiceImpl.java      |   6 ------
 org.argeo.suite.workbench.rap/plugin.xml          |   2 +-
 .../workbench/parts/DefaultDashboardEditor.java   |   3 +--
 .../theme/argeo-classic/icons/add.gif             | Bin 0 -> 318 bytes
 .../theme/argeo-classic/icons/add.png             | Bin 477 -> 0 bytes
 5 files changed, 2 insertions(+), 9 deletions(-)
 create mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.gif
 delete mode 100644 org.argeo.suite.workbench.rap/theme/argeo-classic/icons/add.png

diff --git a/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java b/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java
index 3ca8acf..19067bd 100644
--- a/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/people/PeopleSuiteServiceImpl.java
@@ -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);
diff --git a/org.argeo.suite.workbench.rap/plugin.xml b/org.argeo.suite.workbench.rap/plugin.xml
index bec219d..1d7eab8 100644
--- a/org.argeo.suite.workbench.rap/plugin.xml
+++ b/org.argeo.suite.workbench.rap/plugin.xml
@@ -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
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index 7e51ede..cc45bb2 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -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
index 0000000000000000000000000000000000000000..252d7ebcb8c74d6e5de66ef0eb8856622a0e9d89
GIT binary patch
literal 318
zcmZ?wbhEHb6krfwxXQp_S{7na6>d=(Ze15;Qy1mX8t2lT<l2+$3M9LeU3-$eCZ~H%
z&hVd=6EG_$WMN_G!orY+1rf_jLl+gstf`FOP#wFbvUf{x@0O5hJ42`K3|nv@V&Q>^
zHOHgY9FJamJZkN+sI|wVk6ueSb}ixP)r4bLfn?%^+sU^crQUj&`rv8W|Ns9PC;*B-
zSr{1@v>9|jW`O*}z!rUAYJrE2RKG`JYNRKhwpQrnor{(Ph`sVEnyR2Kc;c~(o$WdP
zMb0Wl6K^dQ-0hgs;<SKI<H^q-;x25QTwKyJ($ZWU?Cc(_l2WWuEE3|(QH)cWq8R2f
LL@ik0$Y2cszSC!^

literal 0
HcmV?d00001

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
index 4d073303dcd84b46ef2d9c69ba7e6032988e4092..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 477
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggqPA)-htqtF9?E#t+>*?YcVsUzD
zuwmaJ0|A*G+DaF9EGcQ8knu?W1H+Ui^$!gZi=0G0hQG-8%oH3HprXHF^%g$)gmo52
zClr+5dFgiRkn;Ikvu?^VD*S8wuBh135X6-^%ZY=LA>+1KY3$-vT3d2|UulW;)LglB
z+16=_EM**u7oxn^nl7DEbLBx`PS3((J+A4eRm*qB+E_o&=#eyIY!$c?_5Fy7<xHO)
zaqFw+6!%4Cb18B(Br^nfDV{d+(2Sp@w$x=>YJk^WU!Th&UYaJp&C4<$J-z+5O@K*n
zy7!Z3pDRs%mRQx!iV$J-EZTpcpSMaYTi0`w1{YI;{;{iBtuITY&fk73)_s&|_F1)}
z%{Sjz9<w=Lz432Kl6dyK=jFn?6@TikTICdbouQ%7eM&0l`@h~BzssdYev|uCHlgiD
z)`WWuGxF~3{SI`V$0Qaf4i!(K@`p8cj|(gwRM>p0vy#et96vqt%l*=S3>6aseuf>H
Rb`lu&44$rjF6*2UngCrK!u|jN

-- 
2.30.2