Author: olamy
Date: Thu Sep 6 14:21:22 2012
New Revision: 1381617
URL: http://svn.apache.org/viewvc?rev=1381617&view=rev
Log:
logout must reload screen to take care of no more karma
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/templates/archiva/menu.html
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=1381617&r1=1381616&r2=1381617&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 Sep 6 14:21:22 2012
@@ -44,11 +44,22 @@ function(jquery,ui,sammy,tmpl) {
$("#register-link").show();
$("#logout-link").hide();
$("#change-password-link").hide();
+ // cleanup karmas
+ window.redbackModel.operatioNames=[];
hideElementWithKarma();
- if (doScreenChange) screenChange();
+ if (doScreenChange) {
+ screenChange();
+ }
$("#main-content").html("");
$.ajax({
- url: 'restServices/redbackServices/loginService/logout'
+ url: 'restServices/redbackServices/loginService/logout',
+ complete: function(){
+ if(!doScreenChange){
+ // refresh the screen as no more karmas now
+ window.sammyArchivaApplication.refresh();
+ }
+ }
+
});
};
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html?rev=1381617&r1=1381616&r2=1381617&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
Thu Sep 6 14:21:22 2012
@@ -79,7 +79,7 @@
</a>
</li>
<li id="logout-link" style="display: none">
- <a onclick="logout(true);" id="logout-link-a">
+ <a onclick="logout(false);" id="logout-link-a">
<span class="btn btn-danger label
force-upper-case">${$.i18n.prop('logout')}</span>
</a>
</li>
