Repository: ambari Updated Branches: refs/heads/trunk af67390b9 -> cd0081c55
AMBARI-6967. Admin View: default login behavior (route to Admin View, Cluster Dashboard, or Views Landing page). (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd0081c5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd0081c5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd0081c5 Branch: refs/heads/trunk Commit: cd0081c55f53f87076c191f21648f9f6477119e7 Parents: af67390 Author: Yusaku Sako <yus...@hortonworks.com> Authored: Wed Aug 27 23:59:35 2014 -0700 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Wed Aug 27 23:59:35 2014 -0700 ---------------------------------------------------------------------- .../controllers/global/cluster_controller.js | 44 -------------------- 1 file changed, 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cd0081c5/ambari-web/app/controllers/global/cluster_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js index 246ad8b..bc09b0a 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -347,50 +347,6 @@ App.ClusterController = Em.Controller.extend({ }, callback) }, - loadAmbariViews: function () { - App.ajax.send({ - name: 'views.info', - sender: this, - success: 'loadAmbariViewsSuccess' - }); - }, - - loadAmbariViewsSuccess: function (data) { - if (data.items.length) { - App.ajax.send({ - name: 'views.instances', - sender: this, - success: 'loadViewInstancesSuccess' - }); - } else { - this.set('ambariViews', []); - } - }, - - loadViewInstancesSuccess: function (data) { - this.set('ambariViews', []); - var self = this; - data.items.forEach(function (view) { - view.versions.forEach(function (version) { - version.instances.forEach(function (instance) { - var current_instance = Em.Object.create({ - iconPath: instance.ViewInstanceInfo.icon_path || "/img/ambari-view-default.png", - label: instance.ViewInstanceInfo.label || version.ViewVersionInfo.label || instance.ViewInstanceInfo.view_name, - visible: instance.ViewInstanceInfo.visible || false, - version: instance.ViewInstanceInfo.version, - description: instance.ViewInstanceInfo.description || Em.I18n.t('views.main.instance.noDescription'), - viewName: instance.ViewInstanceInfo.view_name, - instanceName: instance.ViewInstanceInfo.instance_name, - href: instance.ViewInstanceInfo.context_path - }); - if( current_instance.visible){ - self.get('ambariViews').pushObject(current_instance); - } - }, this); - }, this); - }, this); - }, - /** * * @param callback