From: Olivier Lamy <olamy@apache.org>
Date: Thu, 6 Sep 2012 14:21:08 +0000 (+0000)
Subject: after login redisplay current screen to consider new user karmas
X-Git-Tag: archiva-1.4-M3~290
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56533b964bcba2957dc76f50a455a87c0252d9d2;p=archiva.git

after login redisplay current screen to consider new user karmas

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

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 eb5454634..dca92888c 100644
--- 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
@@ -339,8 +339,6 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
    */
   loginBox=function(){
 
-
-
     if (window.modalLoginWindow!=null){
       window.modalLoginWindow=null;
     }
@@ -388,6 +386,7 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
    * @param result
    */
   var successLoginCallbackFn=function(result){
+
     var logged = false;
     if (result == null) {
       logged = false;
@@ -419,6 +418,7 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
       }
       clearForm("#user-login-form");
       decorateMenuWithKarma(user);
+
       return;
     }
     var modalLoginErrMsg=$("#modal-login-err-message");
@@ -443,6 +443,8 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
   var completeLoginCallbackFn=function(){
     $("#modal-login-ok").removeAttr("disabled");
     $("#small-spinner").remove();
+    // force current screen reload to consider user karma
+    window.sammyArchivaApplication.refresh();
   }
 
   resetPasswordForm=function(key){
@@ -535,7 +537,7 @@ define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","kno
   login=function(){
     $.log("user.js#login");
     $("#modal-login-err-message").html("");
-    screenChange();
+
     var valid = $("#user-login-form").valid();
     if (!valid) {
         return;