Browse Source

AMBARI-5781. Views: when a particular view is selected, the URL should reflect it so that upon page refresh the right view loads up.(xiwang)

Xi Wang 11 years ago
parent
commit
b88de637e3
2 changed files with 16 additions and 10 deletions
  1. 1 1
      ambari-web/app/controllers/main/views_controller.js
  2. 15 9
      ambari-web/app/routes/main.js

+ 1 - 1
ambari-web/app/controllers/main/views_controller.js

@@ -26,7 +26,7 @@ App.MainViewsController = Em.Controller.extend({
   setView: function(event) {
     if(event.context){
       this.set('selectedView', event.context);
-      App.router.transitionTo('views');
+      App.router.transitionTo('main.views.viewDetails', event.context);
     }
   }
 })

+ 15 - 9
ambari-web/app/routes/main.js

@@ -62,13 +62,10 @@ module.exports = Em.Route.extend({
     redirectsTo: 'dashboard.index'
   }),
 
+  connectOutlets: function (router, context) {
+    router.get('applicationController').connectOutlet('main');
+  },
 
-  views: Ember.Route.extend({
-    route: '/views',
-    connectOutlets: function (router, context) {
-      router.get('mainController').connectOutlet('mainViews');
-    }
-  }),
   test: Em.Route.extend({
     route: '/test',
     connectOutlets: function (router, context) {
@@ -76,9 +73,18 @@ module.exports = Em.Route.extend({
     }
   }),
 
-  connectOutlets: function (router, context) {
-    router.get('applicationController').connectOutlet('main');
-  },
+  views: Em.Route.extend({
+    route: '/views',
+    connectOutlets: function (router, context) {
+      router.get('mainController').connectOutlet('mainViews');
+    },
+    viewDetails: Em.Route.extend({
+      route : '/:viewName/:version/:instanceName',
+      connectOutlets :  function (router, context) {
+        router.get('mainController').connectOutlet('mainViews');
+      }
+    })
+  }),
 
   dashboard: Em.Route.extend({
     route: '/dashboard',