From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 8 Jan 2014 18:42:02 +0000 (+0000)
Subject: Reduce visibility of JCR explorer to users that are in ROLE_ADMIN
X-Git-Tag: argeo-commons-2.1.30~623
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f45414b98190d0453d0a00fd77a5d4fb824ceb9f;p=lgpl%2Fargeo-commons.git

Reduce visibility of JCR explorer to users that are in ROLE_ADMIN
See https://www.argeo.org/bugzilla/show_bug.cgi?id=206

git-svn-id: https://svn.argeo.org/commons/trunk@6716 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml
index 31f33eb70..a34360717 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml
+++ b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml
@@ -206,111 +206,123 @@
 		         icon="icons/addWorkspace.png"
 		         label="Create Workspace"
 		         style="push">
-			<visibleWhen>
-				<iterate>
-			      <and>
-			         <or>
-			            <instanceof
-			                  value="org.argeo.jcr.ui.explorer.model.RepositoryElem">
-			            </instanceof>
-			         </or>
-             		<with variable="activeMenuSelection"><count value="1"/></with>
-			      </and>
-				</iterate>
-			</visibleWhen>
+				<visibleWhen>
+					<iterate>
+			      		<and>
+			         		<or>
+			            		<instanceof
+			                  		value="org.argeo.jcr.ui.explorer.model.RepositoryElem">
+			            		</instanceof>
+			         		</or>
+             				<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
 			</command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.deleteNodes"
-           icon="icons/remove.gif"
-		   label="Delete Nodes"
-           style="push">
-        <visibleWhen>
-           <iterate>
-              <or>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem">
-                 </instanceof>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.WorkspaceElem">
-                 </instanceof>
-              </or>
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.importFileSystem"
-           icon="icons/import_fs.png"
-           style="push"
-           tooltip="Import files from the files sytem">
-        <visibleWhen>
-           <iterate>
-              <and>
-                 <or>
-                    <instanceof
-                          value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem">
-                    </instanceof>
-                    <instanceof
-                          value="org.argeo.jcr.ui.explorer.model.WorkspaceElem">
-                    </instanceof>
-                 </or>
-                 <with variable="activeMenuSelection"><count value="1"/></with>
-              </and>
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.addRemoteRepository"
-           icon="icons/addRepo.gif"
-           style="push">
-        <visibleWhen>
-           <iterate> 
-				<or>
-              		<instanceof
-                    	value="org.argeo.jcr.ui.explorer.model.RepositoriesElem">
-					</instanceof>
-					<instanceof
-						value="org.argeo.jcr.ui.explorer.model.RepositoryElem">
-					</instanceof>
-				</or> 
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.removeRemoteRepository"
-           icon="icons/remove.gif"
-           style="push">
-        <visibleWhen>
-           <iterate> 
-				<or>
-					<instanceof
-						value="org.argeo.jcr.ui.explorer.model.RemoteRepositoryElem">
-					</instanceof>
-				</or> 
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.getNodeSize"
-           icon="icons/getSize.gif"
-           style="push">
-        <visibleWhen>
-           <iterate>
-              <or>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem">
-                 </instanceof>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.WorkspaceElem">
-                 </instanceof>
-              </or>
-           </iterate>
-        </visibleWhen>
-     </command>
-  </menuContribution>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.deleteNodes"
+				icon="icons/remove.gif"
+				label="Delete Nodes"
+				style="push">
+				<visibleWhen>
+					<iterate>
+						<or>
+							<instanceof
+								value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem" />
+							<instanceof
+								value="org.argeo.jcr.ui.explorer.model.WorkspaceElem" />
+						</or>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.importFileSystem"
+				icon="icons/import_fs.png"
+				style="push"
+				tooltip="Import files from the files sytem">
+				<visibleWhen>
+					<iterate>
+						<and>
+							<or>
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem" />
+								<instanceof
+                          			value="org.argeo.jcr.ui.explorer.model.WorkspaceElem" />
+                 			</or>
+                 			<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.addRemoteRepository"
+				icon="icons/addRepo.gif"
+				style="push">
+					<visibleWhen>
+						<iterate> 
+							<or>
+								<instanceof
+                    				value="org.argeo.jcr.ui.explorer.model.RepositoriesElem" />
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.RepositoryElem" />
+							</or> 
+						</iterate>
+					</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.removeRemoteRepository"
+				icon="icons/remove.gif"
+				style="push">
+				<visibleWhen>
+					<iterate> 
+						<or>
+							<instanceof
+								value="org.argeo.jcr.ui.explorer.model.RemoteRepositoryElem" />
+						</or> 
+           			</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.getNodeSize"
+				icon="icons/getSize.gif"
+				style="push">
+					<visibleWhen>
+						<iterate>
+							<or>
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem" />
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.WorkspaceElem" />
+              				</or>
+           				</iterate>
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+
+	<!-- Reduce visibility of JCR Explorer perspective to users that are in ROLE_ADMIN --> 	
+	<extension
+    	point="org.eclipse.ui.activities">
+		<activity
+			description="Only for admins"
+			id="org.argeo.jcr.ui.explorer.adminActivity"
+            name="Jcr Technical Admin">
+			<enabledWhen>
+				<with variable="roles">
+					<iterate ifEmpty="false" operator="or">
+						<equals value="ROLE_ADMIN" />
+					</iterate>
+				</with>
+			</enabledWhen>
+		</activity>
+        <activityPatternBinding
+			activityId="org.argeo.jcr.ui.explorer.adminActivity"
+			isEqualityPattern="true"
+			pattern="org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.perspective">
+		</activityPatternBinding>
 	</extension>
-	
+
 	<!-- Core expression definition 
-	
 	<extension
          point="org.eclipse.core.expressions.definitions">
       <definition
@@ -323,13 +335,5 @@
          </with>
       </definition>
    </extension>
-	
-  <extension
-           point="org.eclipse.ui.activities">
-        <activityPatternBinding
-              activityId="org.argeo.security.ui.adminActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.perspective">
-        </activityPatternBinding>
-     </extension> -->
-</plugin>
+	--> 
+</plugin>
\ No newline at end of file