Repository: ambari Updated Branches: refs/heads/trunk 8c3d2acd4 -> f8d75a608
AMBARI-11015 JS error after Host configs page reload. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8d75a60 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8d75a60 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8d75a60 Branch: refs/heads/trunk Commit: f8d75a60870d1942d85f1ed1d3d2e393b681a7d8 Parents: 8c3d2ac Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Fri May 8 12:16:54 2015 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Fri May 8 12:16:54 2015 +0300 ---------------------------------------------------------------------- .../controllers/global/cluster_controller.js | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f8d75a60/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 954f155..1c064c8 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -283,24 +283,24 @@ App.ClusterController = Em.Controller.extend({ }); updater.updateServiceMetric(function () { - App.config.loadConfigsFromStack(App.Service.find().mapProperty('serviceName')); - - updater.updateComponentConfig(function () { - self.updateLoadStatus('componentConfigs'); - }); + App.config.loadConfigsFromStack(App.Service.find().mapProperty('serviceName')).complete(function() { + updater.updateComponentConfig(function () { + self.updateLoadStatus('componentConfigs'); + }); - updater.updateComponentsState(function () { - self.updateLoadStatus('componentsState'); - }); - self.updateLoadStatus('serviceMetrics'); - - updater.updateAlertGroups(function () { - updater.updateAlertDefinitions(function() { - updater.updateAlertDefinitionSummary(function () { - updater.updateUnhealthyAlertInstances(function () { - self.updateLoadStatus('alertGroups'); - self.updateLoadStatus('alertDefinitions'); - self.updateLoadStatus('alertInstancesUnhealthy'); + updater.updateComponentsState(function () { + self.updateLoadStatus('componentsState'); + }); + self.updateLoadStatus('serviceMetrics'); + + updater.updateAlertGroups(function () { + updater.updateAlertDefinitions(function() { + updater.updateAlertDefinitionSummary(function () { + updater.updateUnhealthyAlertInstances(function () { + self.updateLoadStatus('alertGroups'); + self.updateLoadStatus('alertDefinitions'); + self.updateLoadStatus('alertInstancesUnhealthy'); + }); }); }); });
