Repository: ambari Updated Branches: refs/heads/trunk 407c63f82 -> 0da68672a
AMBARI-15800. Infinite spinner on the graph popup with no data (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c3ea7ef1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c3ea7ef1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c3ea7ef1 Branch: refs/heads/trunk Commit: c3ea7ef1cf69e10e067b7a70b0f0187212713730 Parents: 407c63f Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Mon Apr 11 13:32:11 2016 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Apr 12 11:08:43 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/views/common/chart/linear_time.js | 1 + .../controllers/main/admin/kerberos/step4_controller_test.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c3ea7ef1/ambari-web/app/views/common/chart/linear_time.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/chart/linear_time.js b/ambari-web/app/views/common/chart/linear_time.js index bc00bb2..821e004 100644 --- a/ambari-web/app/views/common/chart/linear_time.js +++ b/ambari-web/app/views/common/chart/linear_time.js @@ -608,6 +608,7 @@ App.ChartLinearTimeView = Ember.View.extend(App.ExportMetricsMixin, { } } else { + this.set('isPopupReady', true); this.set('isReady', true); //if Axis X time interval is default(60 minutes) if (this.get('timeUnitSeconds') === 3600) { http://git-wip-us.apache.org/repos/asf/ambari/blob/c3ea7ef1/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js index 75507f0..1d69a29 100644 --- a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js +++ b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js @@ -360,8 +360,8 @@ describe('App.KerberosWizardStep4Controller', function() { var genConfigType = function(fileName, properties) { var configTypeObj = {}; configTypeObj.type = fileName; - configTypeObj.properties = properties.reduce(function(p,c) { - p[c[0]] = c[1]; + configTypeObj.properties = properties.reduce(function(p, _c) { + p[_c[0]] = _c[1]; return p; }, {}); return configTypeObj;
