svn commit: r1397492 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/startup.js redback/redback.js

[olamy]

Author: olamy
Date: Fri Oct 12 09:30:32 2012
New Revision: 1397492

URL: http://svn.apache.org/viewvc?rev=1397492&view=rev
Log:
take of karma or logged user when 403: session ended

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js?rev=1397492&r1=1397491&r2=1397492&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
 Fri Oct 12 09:30:32 2012
@@ -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'));
       }
     }
   });

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1397492&r1=1397491&r2=1397492&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
 Fri Oct 12 09:30:32 2012
@@ -44,8 +44,9 @@ define("redback",["jquery","utils","jque
       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);
         }
       }
     });