X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fplugin.xml;h=28ee5ee7ef54462e6f2a49cbd4cfa24fb75792da;hb=5439d82a86296ed5ee3a770541c69a048ac38bfd;hp=6bdfd6d8b4b8e923a44f42749fd57e3ab3158818;hpb=d4e81d47521226b3b877d4d4682e4837450d8d55;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/plugin.xml b/org.argeo.security.ui.admin/plugin.xml
index 6bdfd6d8b..28ee5ee7e 100644
--- a/org.argeo.security.ui.admin/plugin.xml
+++ b/org.argeo.security.ui.admin/plugin.xml
@@ -38,6 +38,13 @@
             id="org.argeo.security.ui.admin.userEditor"
             name="User"
             icon="icons/user.gif"
+            default="false">
+		</editor>
+		<editor
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+            id="org.argeo.security.ui.admin.groupEditor"
+            name="User"
+            icon="icons/users.gif"
             default="false">
 		</editor>
 	</extension>
@@ -52,9 +59,14 @@
       	</command>
 		<command
 			id="org.argeo.security.ui.admin.deleteUsers"
-			defaultHandler="org.argeo.security.ui.admin.commands.DeleteUsers"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
 			name="Delete User">
 		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            id="org.argeo.security.ui.admin.userBatchUpdate"
+            name="User batch update">
+		</command>
 		<!-- Group CRUD -->
 		<command
 			id="org.argeo.security.ui.admin.newGroup"
@@ -63,7 +75,7 @@
 		</command>
 		<command
             id="org.argeo.security.ui.admin.deleteGroups"
-            defaultHandler="org.argeo.security.ui.admin.commands.DeleteGroups"
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
             name="Delete Group">
 		</command>
 		<!-- Transaction -->
@@ -79,16 +91,10 @@
 
  	  <!-- Force the refresh when the various listener are not enough -->
       <command
-            defaultHandler="org.argeo.security.ui.admin.commands.ForceRefresh"
+            defaultHandler="org.argeo.security.ui.admin.internal.commands.ForceRefresh"
             id="org.argeo.security.ui.admin.forceRefresh"
             name="Force Refresh">
       </command>
-      <!-- 
-      <command
-            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-            id="org.argeo.security.ui.admin.userBatchUpdate"
-            name="User batch update">
-      </command> -->
 	</extension>
 	
 	<!-- MENU CONTRIBUTIONS -->
@@ -97,30 +103,6 @@
 		<menuContribution
 			locationURI="toolbar:org.argeo.security.ui.rap.userToolbar?after=org.eclipse.ui.file.saveAll"> 
 			<!-- Transaction management --> 
- 			<command
-				commandId="org.argeo.security.ui.admin.userTransactionHandler"
-				icon="icons/begin.gif"
-				label="Begin Transaction"
-				style="push"
-				tooltip="Begin a user transaction">
-<!--				<visibleWhen>
-					<and>
-						<with variable="activePart">
-							<instanceof value="org.argeo.cms.CmsEditable" />
-						</with>
-						<with variable="org.argeo.connect.people.rap.editingState">
-							<equals value="notEditing" />
-						</with> -->
-						<!-- FIXME : never true, the role condition does not work -->
-						<!-- <with variable="roles">
-			      			<iterate ifEmpty="false" operator="or">
-			        			<equals value="ROLE_BUSINESS_ADMIN" />
-			      			</iterate>
-			    		</with> -->
-<!--			    	</and>
-				</visibleWhen> -->
-				<parameter name="param.commandId" value="transaction.begin" />
-			</command>
  			<command
 				commandId="org.argeo.security.ui.admin.userTransactionHandler"
 				icon="icons/commit.gif"
@@ -128,6 +110,11 @@
 				style="push"
 				tooltip="Commit a user transaction">
 				<parameter name="param.commandId" value="transaction.commit" />
+				<visibleWhen>
+					<with variable="org.argeo.security.ui.admin.userTransactionState">
+							<equals value="status.active" />
+					</with>
+				</visibleWhen>
 			</command>
  			<command
 				commandId="org.argeo.security.ui.admin.userTransactionHandler"
@@ -136,6 +123,11 @@
 				style="push"
 				tooltip="Abandon current changes and rollback to the latest commited version">
 				<parameter name="param.commandId" value="transaction.rollback" />
+				<visibleWhen>
+					<with variable="org.argeo.security.ui.admin.userTransactionState">
+							<equals value="status.active" />
+					</with>
+				</visibleWhen>
 			</command>
 		</menuContribution>
     
@@ -160,12 +152,12 @@
                   label="Add User"
                   tooltip="Create a new user">
             </command>
-            <!--<command
+            <command
                   commandId="org.argeo.security.ui.admin.userBatchUpdate"
                   icon="icons/batch.gif"
                   label="Update users"
                   tooltip="Perform maintenance activities on a list of chosen users">
-            </command>-->
+            </command>
         </menuContribution>
 
     	<!-- GroupsView specific toolbar menu -->
@@ -201,19 +193,38 @@
             </command>
         </menuContribution> -->
 	</extension>
+
+	<!-- SERVICES -->
+	<extension
+      	point="org.eclipse.ui.services">
+	 <sourceProvider
+	        id="org.argeo.security.ui.admin.userTransactionProvider"
+            provider="org.argeo.eclipse.spring.SpringExtensionFactory" >
+	   		<variable
+	            name="org.argeo.security.ui.admin.userTransactionState"
+	            priorityLevel="workbench">
+	      	</variable>
+	   	</sourceProvider>
+	</extension>
   
   	<!-- ACTIVITIES -->
 	<extension
 		point="org.eclipse.ui.activities">
-		<activityPatternBinding
+		<!-- group admin is intended to make all user and group maintenance operations -->
+		<!--<activityPatternBinding
 			activityId="org.argeo.security.ui.userAdminActivity"
 			isEqualityPattern="true"
 			pattern="org.argeo.security.ui.admin/org.argeo.security.ui.admin.adminSecurityPerspective">
-		</activityPatternBinding>
+		</activityPatternBinding>-->
 		<activityPatternBinding
 			activityId="org.argeo.security.ui.groupAdminActivity"
 			isEqualityPattern="true"
-			pattern="org.argeo.security.ui.admin/org.argeo.security.ui.admin.adminRolesView">
+			pattern="org.argeo.security.ui.admin/org.argeo.security.ui.admin.adminSecurityPerspective">
 		</activityPatternBinding>
 	</extension>
+	
+	<!-- STARTUP  --> 
+	<extension point="org.eclipse.ui.startup">
+   		<startup class="org.argeo.security.ui.admin.internal.PartStateChanged"/>
+	</extension>
 </plugin>
\ No newline at end of file