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/05/27 01:43:25 UTC
ambari git commit: AMBARI-11402. 'Add Metric' menu cannot open after
a dataset/expression got deleted.(XIWANG)
Repository: ambari
Updated Branches:
refs/heads/trunk a285987dd -> ee8e2f650
AMBARI-11402. 'Add Metric' menu cannot open after a dataset/expression got deleted.(XIWANG)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee8e2f65
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee8e2f65
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee8e2f65
Branch: refs/heads/trunk
Commit: ee8e2f650b8f0c328a39d5b6a1317ee75dcd5b33
Parents: a285987
Author: Xi Wang <xi...@apache.org>
Authored: Tue May 26 15:17:07 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Tue May 26 16:43:10 2015 -0700
----------------------------------------------------------------------
ambari-web/app/styles/enhanced_service_dashboard.less | 2 +-
.../templates/main/service/widgets/create/expression.hbs | 2 +-
.../views/main/service/widgets/create/expression_view.js | 10 +++++++---
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee8e2f65/ambari-web/app/styles/enhanced_service_dashboard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less b/ambari-web/app/styles/enhanced_service_dashboard.less
index 22e5ce9..a4a9730 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -472,7 +472,7 @@
}
}
-#add-metric-menu{
+.add-metric-menu{
.select-options-dropdown {
width: 240px;
max-height: 123px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee8e2f65/ambari-web/app/templates/main/service/widgets/create/expression.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/widgets/create/expression.hbs b/ambari-web/app/templates/main/service/widgets/create/expression.hbs
index 969c56e..826cb43 100644
--- a/ambari-web/app/templates/main/service/widgets/create/expression.hbs
+++ b/ambari-web/app/templates/main/service/widgets/create/expression.hbs
@@ -17,7 +17,7 @@
}}
<div class="actions-field row-fluid">
- {{view App.AddMetricExpressionView}}
+ {{view App.AddMetricExpressionView class="add-metric-menu"}}
<div class="btn-group span2 add-operator">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
{{t dashboard.widgets.wizard.step2.newOperator}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee8e2f65/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 919e207..9900915 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
@@ -204,7 +204,10 @@ App.AddMetricExpressionView = Em.View.extend({
controller: function () {
return this.get('parentView.controller');
}.property('parentView.controller'),
- elementId: 'add-metric-menu',
+ elementId: function () {
+ var expressionId = "_" + this.get('parentView').get('expression.id');
+ return 'add-metric-menu' + expressionId;
+ }.property(),
didInsertElement: function () {
//prevent dropdown closing on click select
$('html').on('click.dropdown', '.dropdown-menu li', function (e) {
@@ -329,7 +332,7 @@ App.AddMetricExpressionView = Em.View.extend({
}
for (var serviceName in servicesMap) {
- components = [];
+ var components = [];
for (var componentId in servicesMap[serviceName].components) {
//HBase service should not show "Active HBase master"
@@ -429,7 +432,8 @@ App.InputCursorTextfieldView = Ember.TextField.extend({
this.set('value', '');
} else if (value && value == 'm') {
// open add metric menu
- $('#add-metric-menu > div > a').click();
+ var expressionId = "_" + parentView.get('expression.id');
+ $('#add-metric-menu' + expressionId + '> div > a').click();
this.set('value', '');
} else if (value) {
// invalid operator