[Amdatu-commits] SVN r570 - trunk/amdatu-authorization/useradmin-gadget/src/main/resources/static/js

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Thu Jan  6 14:23:34 2011
New Revision: 570

Log:
[AMDATU-249] When a new user was added, no REST call was made to set its 
password

Modified:
   
trunk/amdatu-authorization/useradmin-gadget/src/main/resources/static/js/useradmin.js

Modified: 
trunk/amdatu-authorization/useradmin-gadget/src/main/resources/static/js/useradmin.js
==============================================================================
--- 
trunk/amdatu-authorization/useradmin-gadget/src/main/resources/static/js/useradmin.js
       (original)
+++ 
trunk/amdatu-authorization/useradmin-gadget/src/main/resources/static/js/useradmin.js
       Thu Jan  6 14:23:34 2011
@@ -180,6 +180,36 @@
   }
 }
 
+function onUserAdded(response) {
+  if (response.rc == 200) {
+    // Role added successfully, try to set password
+    var name = document.getElementById(currentView + 
"_name").value.to_rfc3986();
+    var newpassword = document.getElementById('password').value
+    var url = "/rest/users/" + name + "/credentials/password";
+    updatePassword(url, onPasswordSetForNewUser, newpassword);
+  } else if (response.rc == 304) {
+    showError(prefs.getMsg('role_already_exists'));
+  } else if (response.rc == 401) {
+    showError(prefs.getMsg('accessdenied'));
+  } else {
+    showError(prefs.getMsg('unexpected_error') + response.errors);
+  }
+}
+
+function onPasswordSetForNewUser(response) {
+  if (response.rc == 200) {
+    showInfo(prefs.getMsg('role_added'));
+    loadRoles(currentUrl, onRolesLoaded);
+    gadgets.window.adjustHeight();
+  } else if (response.rc == 404) {
+    showError(prefs.getMsg('role_not_found'));
+  } else if (response.rc == 401) {
+    showError(prefs.getMsg('accessdenied'));
+  } else {
+    showError(prefs.getMsg('unexpected_error') + response.errors);
+  }
+}
+
 function onMemberAdded(response) {
   if (response.rc == 200) {
     // Role added successfully
@@ -254,11 +284,11 @@
   if (currentView == "user") {
     var newpassword = document.getElementById('password').value
     var url = "/rest/users/" + name;
-    if (method == "update") {
+    if (method != "update") {
+      addRole(url, onUserAdded);
+    } else {
       url += "/credentials/password";
       updatePassword(url, onPasswordChanged, newpassword);
-    } else {
-      addRole(url, onRoleAdded);
     }
   } else {
     var url = "/rest/groups/" + name;