You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/18 16:44:07 UTC
[18/34] git commit: AMBARI-7375. Views list not loaded into menu
after first login. (yusaku)
AMBARI-7375. Views list not loaded into menu after first login. (yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/856ac44f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/856ac44f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/856ac44f
Branch: refs/heads/branch-alerts-dev
Commit: 856ac44f8074527f44df79d43e6335479ae712c1
Parents: dcc03bc
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Wed Sep 17 16:30:28 2014 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Sep 17 16:34:02 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/main.js | 1 -
ambari-web/app/controllers/main/views_controller.js | 6 +++++-
ambari-web/app/routes/main.js | 1 -
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/856ac44f/ambari-web/app/controllers/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main.js b/ambari-web/app/controllers/main.js
index b5d83c4..55db450 100644
--- a/ambari-web/app/controllers/main.js
+++ b/ambari-web/app/controllers/main.js
@@ -44,7 +44,6 @@ App.MainController = Em.Controller.extend({
*/
initialize: function(){
App.router.get('clusterController').loadClusterData();
- App.router.get('mainViewsController').loadAmbariViews();
},
dataLoading: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/856ac44f/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 b3b36fe..fb1dce7 100644
--- a/ambari-web/app/controllers/main/views_controller.js
+++ b/ambari-web/app/controllers/main/views_controller.js
@@ -25,6 +25,10 @@ App.MainViewsController = Em.Controller.extend({
ambariViews: [],
+ init: function () {
+ this.loadAmbariViews();
+ },
+
dataLoading: function () {
var viewsController = this;
var dfd = $.Deferred();
@@ -103,7 +107,7 @@ App.MainViewsController = Em.Controller.extend({
setView: function(event) {
if(event.context){
- App.router.transitionTo('views.viewDetails', event.context);
+ App.router.transitionTo('main.views.viewDetails', event.context);
}
}
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/856ac44f/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index d6521bd..44e64b9 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -39,7 +39,6 @@ module.exports = Em.Route.extend({
}
else {
App.router.get('clusterController').set('isLoaded', true);
- App.router.get('mainViewsController').loadAmbariViews();
}
}
});