You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/06/08 05:06:14 UTC
ambari git commit: AMBARI-11773. Widgets: should allow add w/o
selecting aggregation.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 8ee03b620 -> 4cbd1dc27
AMBARI-11773. Widgets: should allow add w/o selecting aggregation.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4cbd1dc2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4cbd1dc2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4cbd1dc2
Branch: refs/heads/trunk
Commit: 4cbd1dc27c69492c2a631ead1f252661aec3ee7d
Parents: 8ee03b6
Author: Xi Wang <xi...@apache.org>
Authored: Sun Jun 7 16:35:07 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Sun Jun 7 16:35:14 2015 -0700
----------------------------------------------------------------------
.../app/views/main/service/widgets/create/expression_view.js | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cbd1dc2/ambari-web/app/views/main/service/widgets/create/expression_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 7d1a661..7216dde 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -234,6 +234,12 @@ App.AddMetricExpressionView = Em.View.extend({
selectedMetric.hostComponentCriteria = self.get('currentSelectedComponent.hostComponentCriteria');
}
self.set('currentSelectedComponent.selectedMetric', selectedMetric);
+ if (self.get('currentSelectedComponent.selectedAggregation') == Em.I18n.t('dashboard.widgets.wizard.step2.aggregateFunction.scanOps')) {
+ var aggregatorId = "#" + self.get('currentSelectedComponent.aggregatorId');
+ var defaultAggregator = self.get('parentView.AGGREGATE_FUNCTIONS')[0];
+ $(aggregatorId).val(1).trigger("chosen:updated");
+ self.set('currentSelectedComponent.selectedAggregation', defaultAggregator);
+ }
}
})
}.property(),