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

[olamy]

Author: olamy
Date: Tue Sep 25 13:27:26 2012
New Revision: 1389857

URL: http://svn.apache.org/viewvc?rev=1389857&view=rev
Log:
fix registration from a registration key

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.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/utils.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1389857&r1=1389856&r2=1389857&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
 Tue Sep 25 13:27:26 2012
@@ -314,7 +314,7 @@ require(["jquery","jquery.tmpl","i18n"],
       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));
+        displayErrorMessage( 
$.i18n.prop(data.errorMessages[index].errorKey,data.errorMessages[index].args?data.errorMessages[index].args:null),idToAppend);
       });
     } else {
       $.log("print data.errorMessage:"+data.errorMessage);

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=1389857&r1=1389856&r2=1389857&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
 Tue Sep 25 13:27:26 2012
@@ -556,6 +556,7 @@ define("redback.user",["jquery","utils",
    * @param registration are we in registration mode ?
    */
   changePasswordBox=function(previousPassword,registration,user,okFn){
+    $.log("changePasswordBox");
     screenChange();
     $.log("changePasswordBox 
previousPassword:"+previousPassword+",registration:"+registration+",user:"+user);
     if (previousPassword==true){
@@ -715,7 +716,15 @@ define("redback.user",["jquery","utils",
           if (registration==true) {
             $.log("changePassword#sucess,registration:"+registration);
             
displaySuccessMessage($.i18n.prop('change.password.success.section.title'))
-            loginCall(user.username(), 
$("#passwordChangeFormNewPassword").val(),successLoginCallbackFn);
+            loginCall(user.username(), 
$("#passwordChangeFormNewPassword").val(),successLoginCallbackFn,
+                function(data){
+                  displayRestError(data,"modal-password-change-content");
+                }
+                ,function(){
+                  window.modalChangePasswordBox.modal('hide');
+                  
window.location=window.location.toString().substringBeforeFirst("?");
+                  window.sammyArchivaApplication.setLocation("#search");
+                });
           } else {
             
displaySuccessMessage($.i18n.prop('change.password.success.section.title'));
           }