ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject ambari git commit: AMBARI-12743. No Data Available on Hosts Metrics graphs (akovalenko)
Date Wed, 12 Aug 2015 16:56:57 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 075445ee0 -> a1904eb6c


AMBARI-12743. No Data Available on Hosts Metrics graphs (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1904eb6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1904eb6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1904eb6

Branch: refs/heads/branch-2.1
Commit: a1904eb6cb38e13e78f2ec212e47c49552554d73
Parents: 075445e
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Wed Aug 12 17:56:02 2015 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Wed Aug 12 19:48:37 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/views/common/chart/linear_time.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a1904eb6/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 6cd90b0..4deb84d 100644
--- a/ambari-web/app/views/common/chart/linear_time.js
+++ b/ambari-web/app/views/common/chart/linear_time.js
@@ -184,7 +184,7 @@ App.ChartLinearTimeView = Ember.View.extend({
   },
 
   loadData: function() {
-    if (this.get('loadGroup')) {
+    if (this.get('loadGroup') && !this.get('isPopup')) {
       App.ChartLinearTimeView.LoadAggregator.add(this, this.get('loadGroup'));
     } else {
       App.ajax.send({
@@ -225,7 +225,6 @@ App.ChartLinearTimeView = Ember.View.extend({
       textStatus = xhr.status + " " + textStatus;
     }
     this._showMessage('warn', this.t('graphs.error.title'), this.t('graphs.error.message').format(textStatus,
errorThrown));
-    this.set('isPopup', false);
     this.set('hasData', false);
   },
 
@@ -420,7 +419,6 @@ App.ChartLinearTimeView = Ember.View.extend({
       else {
         this._showMessage('info', this.t('graphs.noData.title'), this.t('graphs.noDataAtTime.message'));
       }
-      this.set('isPopup', false);
     }
     graph_container = null;
     container = null;
@@ -792,6 +790,7 @@ App.ChartLinearTimeView = Ember.View.extend({
       graph: self,
       secondary: null,
       onPrimary: function() {
+        self.set('currentTimeIndex', 0);
         this.hide();
         self.set('isPopup', false);
       },


Mime
View raw message