take of karma or logged user when 403: session ended

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
index 1edd8f89ec98e95dc4aa026ea8e883141f3fe5bd..964b18376f793b2ec5ba07babe3c030bf96164fe 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
@@ -35,6 +35,10 @@ function() {
         removeMediumSpinnerImg("#main-content");
         clearUserMessages();
         displayErrorMessage($.i18n.prop('authz.karma.needed'));
+
+        userLogged(function(user){
+          userLoggedCallbackFn(user);
+        });
       },
       500: function(data){
         $.log("error 500:"+data.responseText);
@@ -42,8 +46,6 @@ function() {
         removeMediumSpinnerImg("#main-content");
         clearUserMessages();
         displayRestError($.parseJSON(data.responseText));
-        //$("#main-content" ).html("");
-        //displayErrorMessage($.i18n.prop('error.500'));
       }
     }
   });

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
index 6a1bc26d0f0661d02b56f41f2f091b94b22f139a..1a7cbe341d89cf50584a98234045d77898f28bda 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
@@ -44,8 +44,9 @@ define("redback",["jquery","utils","jquery.validate","jquery.json","knockout",
       type: "GET",
       success: function(data) {
         userLogged = data;
+        $.log("userLogged:"+userLogged);
         if (successFn){
-          successFn(userLogged == false ? null : jQuery.parseJSON($.cookie('redback_login')));
+          successFn(userLogged ? jQuery.parseJSON($.cookie('redback_login')):null);
         }
       }
     });