svn commit: r1300949 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/main.js archiva/templates/topbar.html redback/user.js

[olamy]

Author: olamy
Date: Thu Mar 15 12:09:24 2012
New Revision: 1300949

URL: http://svn.apache.org/viewvc?rev=1300949&view=rev
Log:
fix error handling on resetPassword

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
    
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/main.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1300949&r1=1300948&r2=1300949&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 Thu Mar 15 12:09:24 2012
@@ -49,14 +49,14 @@ $(function() {
     $.cookie('redback_login', null);
   }
 
-  logout=function(){
+  logout=function(screenChange){
     deleteLoginCookie();
     $("#login-link").show();
     $("#register-link").show();
     $("#logout-link").hide();
     $("#change-password-link").hide();
     hideElementWithKarma();
-    screenChange();
+    if (screenChange) screenChange();
     $("#main-content").html("");
     $.ajax({
       url: 'restServices/redbackServices/loginService/logout'

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1300949&r1=1300948&r2=1300949&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
 Thu Mar 15 12:09:24 2012
@@ -38,7 +38,7 @@
           <a href="#" 
onclick="editUserDetailsBox();">${$.i18n.prop('edit.details')}</a>
         </li>
         <li id="logout-link" class="pull-right" style="display: none">
-          <a href="#" onclick="logout();" id="logout-link-a">
+          <a href="#" onclick="logout(true);" id="logout-link-a">
             <span class="label label-important 
force-upper-case">${$.i18n.prop('logout')}</span>
           </a>
         </li>

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=1300949&r1=1300948&r2=1300949&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
 Thu Mar 15 12:09:24 2012
@@ -414,7 +414,7 @@ $(function() {
     $.log("resetPasswordForm:"+key);
     validateKey(key,false);
     $.log("resetPasswordForm#validateKey ok");
-    displaySearch();
+    //displaySearch();
   }
 
   passwordReset=function(){
@@ -668,6 +668,7 @@ $(function() {
       error: function(result) {
        var obj = jQuery.parseJSON(result.responseText);
        displayRedbackError(obj);
+       logout(false);
       }
     });