Updated Branches: refs/heads/trunk c6033d353 -> 99d9d038d
AMBARI-3131. Ganglia / Nagios web links shown in Ambari Web are broken when HTTPS is enabled. (Andrii Babiichuk via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/99d9d038 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/99d9d038 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/99d9d038 Branch: refs/heads/trunk Commit: 99d9d038d174297949bd7f23e34ebc74f7dc9342 Parents: c6033d3 Author: Yusaku Sako <[email protected]> Authored: Fri Sep 13 15:16:44 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Fri Sep 13 15:16:44 2013 -0700 ---------------------------------------------------------------------- .../controllers/global/cluster_controller.js | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/99d9d038/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 68651c8..958940b 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -357,7 +357,28 @@ App.ClusterController = Em.Controller.extend({ this.loadAlerts(function(){ self.updateLoadStatus('alerts'); }); + this.loadAmbariProperties(); + }, + + ambariProperties: null, + + loadAmbariProperties: function() { + App.ajax.send({ + name: 'ambari.service', + sender: this, + success: 'loadAmbariPropertiesSuccess', + error: 'loadAmbariPropertiesError' + }); + return this.get('ambariProperties'); + }, + + loadAmbariPropertiesSuccess: function(data) { + console.log('loading ambari properties'); + this.set('ambariProperties', data.RootServiceComponents.properties); + }, + loadAmbariPropertiesError: function() { + console.warn('can\'t get ambari properties'); }, clusterName:function () {
