[MRM-1674] While creating admin account, entering invalid password yields no error...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1389629 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
index f338dca45017a31080ecd87b45fbf0e2c3ffb16b..1edd8f89ec98e95dc4aa026ea8e883141f3fe5bd 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
@@ -37,11 +37,12 @@ function() {
         displayErrorMessage($.i18n.prop('authz.karma.needed'));
       },
       500: function(data){
+        $.log("error 500:"+data.responseText);
         removeSmallSpinnerImg();
         removeMediumSpinnerImg("#main-content");
         clearUserMessages();
         displayRestError($.parseJSON(data.responseText));
-        $("#main-content" ).html("");
+        //$("#main-content" ).html("");
         //displayErrorMessage($.i18n.prop('error.500'));
       }
     }

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index 6ae6465d9285287f4b0d950e7939e59a4bbcc472..8a911ed1b50f076da452f7297c8d42ce1eb5f3d1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -312,6 +312,10 @@ require(["jquery","jquery.tmpl","i18n"], function(jquery,jqueryTmpl,i18n) {
 
     if (data.errorKey && data.errorKey.length>0){
       displayErrorMessage($.i18n.prop( data.errorKey ),idToAppend);
+    } else if (data.errorMessages){
+      $.each(data.errorMessages, function(index, value) {
+        displayErrorMessage( $.i18n.prop(data.errorMessages[index].errorKey,data.errorMessages[index].args?data.errorMessages[index].args:null));
+      });
     } else {
       $.log("print data.errorMessage:"+data.errorMessage);
       displayErrorMessage(data.errorMessage,idToAppend);

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index 65aa740fb209bc7e5431eea12111099740926e47..5ee80f442086725076d830ab010ab8b70a4c7a2f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -117,7 +117,7 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
         });
     };
 
-    this.createAdmin = function() {
+    this.createAdmin = function(succesCallbackFn,errorCallbackFn) {
       $.log("user.js#createAdmin");
       var valid = $("#user-create").valid();
       $.log("create admin");
@@ -142,10 +142,18 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
                 checkSecurityLinks();
               }
               loginCall(currentAdminUser.username(), currentAdminUser.password(),onSuccessCall);
+              if(succesCallbackFn){
+                succesCallbackFn();
+              }
               return this;
             } else {
               displayErrorMessage("admin user not created");
             }
+          },
+          error: function(data){
+            if(errorCallbackFn){
+              errorCallbackFn();
+            }
           }
         });
     };
@@ -261,10 +269,11 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
       if(! $("#user-create" ).valid() ) {
         return;
       }
-      self.user.createAdmin();
-
-      // go to search when admin created
-      window.sammyArchivaApplication.setLocation("#search");
+      self.user.createAdmin(function(){
+          // go to search when admin created
+          window.sammyArchivaApplication.setLocation("#search");
+        }
+      );
     }
   }