[jboss-svn-commits] JBL Code SVN: r31188 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/rpc and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jervisliu
Date: 2010-01-22 03:34:54 -0500 (Fri, 22 Jan 2010)
New Revision: 31188

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
Log:
https://jira.jboss.org/jira/browse/GUVNOR-316: Creating multiple users with same name in UI - previous user record is overwritten - no error/warning generated

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java	2010-01-21 22:05:56 UTC (rev 31187)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/admin/PermissionViewer.java	2010-01-22 08:34:54 UTC (rev 31188)
@@ -214,11 +214,14 @@
 						create.addClickListener(new ClickListener() {
 							public void onClick(Widget w) {
 						        if (userName.getText() != null && userName.getText().length() !=0) {
-							        RepositoryServiceFactory.getService().updateUserPermissions(userName.getText(), new HashMap(), new GenericCallback() {
+							        RepositoryServiceFactory.getService().createUser(userName.getText(), new GenericCallback() {
 								        public void onSuccess(Object a) {
-									    refresh();
-									    showEditor(userName.getText());
-								    }
+									        refresh();
+									        showEditor(userName.getText());
+								        }  	
+								        public void onFailure(Throwable t) {
+						                    super.onFailure(t);
+					                    }
 							    });
 							    form.hide();
 						    } 
@@ -227,6 +230,8 @@
 						
 						form.show();		
 					}
+
+
 				});
 		tb.addButton(create);
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java	2010-01-21 22:05:56 UTC (rev 31187)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java	2010-01-22 08:34:54 UTC (rev 31188)
@@ -503,8 +503,12 @@
      */
     public void deleteUser(String userName);
 
-
     /**
+     * create new user.
+     */
+    public void createUser(String userName);
+    
+    /**
      * Returns the lockers user name
      * @param uuid
      * @return Lockers user name or null if there is no lock.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java	2010-01-21 22:05:56 UTC (rev 31187)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java	2010-01-22 08:34:54 UTC (rev 31188)
@@ -102,6 +102,7 @@
 	public void updateUserPermissions(java.lang.String p0, java.util.Map p1, AsyncCallback cb);
 	public void listAvailablePermissionTypes(AsyncCallback<java.lang.String[]> cb);
 	public void deleteUser(java.lang.String p0, AsyncCallback cb);
+	public void createUser(java.lang.String p0, AsyncCallback cb);
 	public void getAssetLockerUserName(java.lang.String p0, AsyncCallback<java.lang.String> cb);
 	public void lockAsset(java.lang.String p0, AsyncCallback cb);
 	public void unLockAsset(java.lang.String p0, AsyncCallback cb);

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java	2010-01-21 22:05:56 UTC (rev 31187)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java	2010-01-22 08:34:54 UTC (rev 31188)
@@ -303,10 +303,14 @@
 	public String[] listAvailablePermissionTypes() {
 		return getService().listAvailablePermissionTypes();
 	}
-
+	
 	public void deleteUser(String userName) {
 		getService().deleteUser(userName);
 	}
+	
+	public void createUser(String userName) {
+		getService().createUser(userName);
+	}
 
 	/* (non-Javadoc)
      * @see org.drools.guvnor.client.rpc.RepositoryService#getAssetLockerUserName(java.lang.String)

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-01-21 22:05:56 UTC (rev 31187)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-01-22 08:34:54 UTC (rev 31188)
@@ -2453,6 +2453,14 @@
         pm.removeUserPermissions( userName );
         repository.save();
     }
+    
+    @Restrict("#{identity.loggedIn}")
+    public void createUser(String userName) {
+        log.info( "Creating user permissions, user name [" + userName + "]" );
+        PermissionManager pm = new PermissionManager( repository );
+        pm.createUser( userName );
+        repository.save();
+    }
 
     /* (non-Javadoc)
     * @see org.drools.guvnor.client.rpc.RepositoryService#getAssetLockerUserName(java.lang.String)