AMBARI-3928. Config Groups: Navi tab wrong when going back from host config page. (onechiporenko)

ambari-web/app/controllers/main/host/details.js

@@ -23,6 +23,10 @@ App.MainHostDetailsController = Em.Controller.extend({
   content: null,
   isFromHosts: false,
 
+  /**
+   * path to page visited before
+   */
+  referer: '',
   /**
    * open dashboard page
    */
@@ -39,14 +43,6 @@ App.MainHostDetailsController = Em.Controller.extend({
     App.router.transitionTo('main.services.service.summary',service);
   },
 
-  /**
-   * set new value to isFromHosts property
-   * @param isFromHosts new value
-   */
-  setBack: function(isFromHosts){
-    this.set('isFromHosts', isFromHosts);
-  },
-
   /**
    * Send specific command to server
    * @param url

ambari-web/app/routes/main.js

@@ -522,12 +522,13 @@ module.exports = Em.Route.extend({
     }),
 
     back: function (router, event) {
-      window.history.back();
-    },
-
-    showDetails: function (router, event) {
-      router.get('mainHostDetailsController').setBack(true);
-      router.transitionTo('hostDetails.summary', event.context)
+      var referer = router.get('mainHostDetailsController.referer');
+      if (referer) {
+        router.route(referer);
+      }
+      else {
+        window.history.back();
+      }
     },
 
     addHost: function (router) {
@@ -815,10 +816,6 @@ module.exports = Em.Route.extend({
     route: '/dashboard',
     connectOutlets: function (router, context) {
       router.get('mainController').connectOutlet('mainDashboard');
-    },
-    showDetails: function (router, event) {
-      router.get('mainHostDetailsController').setBack(true);
-      router.transitionTo('hosts.hostDetails.summary', event.context);
     }
   }),
 
@@ -885,10 +882,6 @@ module.exports = Em.Route.extend({
         parent.deactivateChildViews();
         event.view.set('active', "active");
         router.transitionTo(event.context);
-      },
-      showDetails: function (router, event) {
-        router.get('mainHostDetailsController').setBack(true);
-        router.transitionTo('hosts.hostDetails.summary', event.context);
       }
     }),
     showService: Em.Router.transitionTo('service'),
@@ -901,7 +894,7 @@ module.exports = Em.Route.extend({
 
   selectService: Em.Route.transitionTo('services.service.summary'),
   selectHost: function (router, event) {
-    router.get('mainHostDetailsController').setBack(false);
+    router.get('mainHostDetailsController').set('isFromHosts', false);
     router.transitionTo('hosts.hostDetails.index', event.context);
   },
   filterHosts: function (router, component) {
@@ -909,5 +902,10 @@ module.exports = Em.Route.extend({
       return;
     router.get('mainHostController').filterByComponent(component.context);
     router.transitionTo('hosts.index');
+  },
+  showDetails: function (router, event) {
+    router.get('mainHostDetailsController').set('referer', router.location.lastSetURL);
+    router.get('mainHostDetailsController').set('isFromHosts', true);
+    router.transitionTo('hosts.hostDetails.summary', event.context);
   }
 });