Author: olamy
Date: Thu Sep 6 14:21:08 2012
New Revision: 1381616
URL: http://svn.apache.org/viewvc?rev=1381616&view=rev
Log:
after login redisplay current screen to consider new user karmas
Modified:
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/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=1381616&r1=1381615&r2=1381616&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 Sep 6 14:21:08 2012
@@ -339,8 +339,6 @@ define("redback.user",["jquery","utils",
*/
loginBox=function(){
-
-
if (window.modalLoginWindow!=null){
window.modalLoginWindow=null;
}
@@ -388,6 +386,7 @@ define("redback.user",["jquery","utils",
* @param result
*/
var successLoginCallbackFn=function(result){
+
var logged = false;
if (result == null) {
logged = false;
@@ -419,6 +418,7 @@ define("redback.user",["jquery","utils",
}
clearForm("#user-login-form");
decorateMenuWithKarma(user);
+
return;
}
var modalLoginErrMsg=$("#modal-login-err-message");
@@ -443,6 +443,8 @@ define("redback.user",["jquery","utils",
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",
login=function(){
$.log("user.js#login");
$("#modal-login-err-message").html("");
- screenChange();
+
var valid = $("#user-login-form").valid();
if (!valid) {
return;