svn commit: r1409348 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/startup.js redback/user.js

[olamy]

Author: olamy
Date: Wed Nov 14 20:04:26 2012
New Revision: 1409348

URL: http://svn.apache.org/viewvc?rev=1409348&view=rev
Log:
in case of issue when reseting password error message must be displayed in the 
modal box

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js?rev=1409348&r1=1409347&r2=1409348&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
 Wed Nov 14 20:04:26 2012
@@ -35,7 +35,6 @@ function(jquery,sammy,utils) {
         removeMediumSpinnerImg("#main-content");
         clearUserMessages();
         displayErrorMessage($.i18n.prop('authz.karma.needed'));
-
         userLogged(function(user){
           userLoggedCallbackFn(user);
         });

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1409348&r1=1409347&r2=1409348&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
 Wed Nov 14 20:04:26 2012
@@ -495,7 +495,14 @@ function(jquery,utils,i18n,jqueryValidat
               newLocation+="#search";
             }
             window.location=newLocation;
-          }
+          },
+           statusCode: {
+             500: function(data){
+               clearUserMessages();
+               
displayRestError($.parseJSON(data.responseText),"modal-password-change-err-message");
+               $("#modal-password-change-err-message" ).show();
+             }
+           }
         });
 
       }