ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-7535 Logging in shows no view instances at top right. (atkach)
Date Mon, 29 Sep 2014 12:48:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f1557e8f7 -> 59284b48b


AMBARI-7535 Logging in shows no view instances at top right. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/59284b48
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59284b48
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59284b48

Branch: refs/heads/trunk
Commit: 59284b48bde8099c52528b00b74d9c0bc6125a92
Parents: f1557e8
Author: atkach <atkach@hortonworks.com>
Authored: Mon Sep 29 15:46:29 2014 +0300
Committer: atkach <atkach@hortonworks.com>
Committed: Mon Sep 29 15:46:29 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/views_controller.js | 4 ----
 ambari-web/app/routes/installer.js                  | 2 +-
 ambari-web/app/routes/main.js                       | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/59284b48/ambari-web/app/controllers/main/views_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/views_controller.js b/ambari-web/app/controllers/main/views_controller.js
index fb1dce7..f175261 100644
--- a/ambari-web/app/controllers/main/views_controller.js
+++ b/ambari-web/app/controllers/main/views_controller.js
@@ -25,10 +25,6 @@ App.MainViewsController = Em.Controller.extend({
 
   ambariViews: [],
 
-  init: function () {
-    this.loadAmbariViews();
-  },
-
   dataLoading: function () {
     var viewsController = this;
     var dfd = $.Deferred();

http://git-wip-us.apache.org/repos/asf/ambari/blob/59284b48/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 8042093..3742428 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -35,6 +35,7 @@ module.exports = Em.Route.extend({
           var name = 'Cluster Install Wizard';
           $('title').text('Ambari - ' + name);
 
+          App.router.get('mainViewsController').loadAmbariViews();
           if (App.get('isAdmin')) {
             router.get('mainController').stopPolling();
             console.log('In installer with successful authenticated');
@@ -82,7 +83,6 @@ module.exports = Em.Route.extend({
               App.router.transitionTo('main.views.index');
             });
           }
-
         });
       } else {
         console.log('In installer but its not authenticated');

http://git-wip-us.apache.org/repos/asf/ambari/blob/59284b48/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 44e64b9..c3c7ecf 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -26,6 +26,7 @@ module.exports = Em.Route.extend({
     console.log('in /main:enter');
     router.getAuthenticated().done(function (loggedIn) {
       if (loggedIn) {
+        App.router.get('mainViewsController').loadAmbariViews();
         App.router.get('clusterController').loadClusterName(false).done(function () {
           if (App.get('testMode')) {
             router.get('mainController').initialize();


Mime
View raw message