You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/08/12 18:48:14 UTC
ambari git commit: AMBARI-12743. No Data Available on Hosts Metrics
graphs (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk def3da8a3 -> 1667fbf99
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/1667fbf9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1667fbf9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1667fbf9
Branch: refs/heads/trunk
Commit: 1667fbf99352586d6cb55a19706a5daa278329ac
Parents: def3da8
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Aug 12 17:59:13 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Aug 12 19:47:11 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/1667fbf9/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);
},