Browse Source

AMBARI-16987. After relogin get the same page was before logout instead of Dashboard (alexantonenko)

Alex Antonenko 9 years ago
parent
commit
babe17dffd
1 changed files with 10 additions and 4 deletions
  1. 10 4
      ambari-web/app/router.js

+ 10 - 4
ambari-web/app/router.js

@@ -597,7 +597,8 @@ App.Router = Em.Router.extend({
         name: 'router.logoff',
         name: 'router.logoff',
         sender: this,
         sender: this,
         success: 'logOffSuccessCallback',
         success: 'logOffSuccessCallback',
-        error: 'logOffErrorCallback'
+        error: 'logOffErrorCallback',
+        beforeSend: 'logOffBeforeSend'
       }).complete(function() {
       }).complete(function() {
         self.logoffRedirect(context);
         self.logoffRedirect(context);
       });
       });
@@ -615,16 +616,21 @@ App.Router = Em.Router.extend({
 
 
   },
   },
 
 
+  logOffBeforeSend: function(opt, xhr) {
+    xhr.setRequestHeader('Authorization', '');
+  },
+
   /**
   /**
    * Redirect function on sign off request.
    * Redirect function on sign off request.
    *
    *
    * @param {$.Event} [context=undefined] - triggered event context
    * @param {$.Event} [context=undefined] - triggered event context
    */
    */
   logoffRedirect: function(context) {
   logoffRedirect: function(context) {
+    this.transitionTo('login', context);
     if (App.router.get('clusterController.isLoaded')) {
     if (App.router.get('clusterController.isLoaded')) {
-      window.location.reload();
-    } else {
-      this.transitionTo('login', context);
+      Em.run.next(function() {
+        window.location.reload();
+      });
     }
     }
   },
   },