fix error handling on resetPassword

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index 25dad0f3c6d1717d0fc2627efef200f16d6390d2..fbb0724d8364210863cf4230cea0d491cc4a77d1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -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'

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
index 16ee84e40cef01bd41c515b5c8532397c150b6be..7409f749c7de61e14c76235f2c3e1f5cc4541da0 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
@@ -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>

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 9400371c86b731a4af581cabd32a0f5ec2b5fb9f..e8d98e2a49295672609c26edffab3a032f76e1c5 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
@@ -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);
       }
     });