ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-11471. Expression builder: cannot see the complete name of a long metric. (jaimin)
Date Thu, 28 May 2015 00:49:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 510a2dd26 -> 7d2a13105


AMBARI-11471. Expression builder: cannot see the complete name of a long metric. (jaimin)


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

Branch: refs/heads/trunk
Commit: 7d2a1310576171ccce9f07a1d7cb0f13a1ed6a37
Parents: 510a2dd
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Wed May 27 17:49:10 2015 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Wed May 27 17:49:17 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/messages.js                                       | 1 +
 ambari-web/app/templates/common/chosen_plugin.hbs                | 4 ++--
 .../templates/main/service/widgets/create/step2_add_metric.hbs   | 2 +-
 .../app/views/main/service/widgets/create/expression_view.js     | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d2a1310/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index afcea4d..db05786 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2602,6 +2602,7 @@ Em.I18n.translations = {
   'dashboard.widgets.wizard.step2.addMetric': 'Add Metric',
   'dashboard.widgets.wizard.step2.aggregateFunction': 'Aggregator Function',
   'dashboard.widgets.wizard.step2.aggregateFunction.scanOps': 'Select Aggregation',
+  'dashboard.widgets.wizard.step2.aggregateFunction.notFound': 'No aggregator function found',
   'dashboard.widgets.wizard.step2.aggregateTooltip': 'This mathematical function will be
applied to compute single value for selected metric across all host components',
   'dashboard.widgets.wizard.step2.threshold.ok.tooltip': 'This is the threshold value at
which the widget color changes from green (OK) to orange (Warning)',
   'dashboard.widgets.wizard.step2.threshold.warning.tooltip': 'This is the threshold value
at which the widget color changes from orange (Warning) to red (Critical)',

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d2a1310/ambari-web/app/templates/common/chosen_plugin.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/chosen_plugin.hbs b/ambari-web/app/templates/common/chosen_plugin.hbs
index ce239ee..df1b89c 100644
--- a/ambari-web/app/templates/common/chosen_plugin.hbs
+++ b/ambari-web/app/templates/common/chosen_plugin.hbs
@@ -18,6 +18,6 @@
 
 <option value="" disabled
         selected>{{view.selectionObj.placeholder_text}}</option>
-{{#each item in view.options}}
-  <option>{{unbound item}}</option>
+{{#each view.options}}
+  <option {{bindAttr title="this"}}>{{unbound this}}</option>
 {{/each}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d2a1310/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs b/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs
index 2ab5383..030ebcd 100644
--- a/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs
+++ b/ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs
@@ -35,7 +35,7 @@
                   <li class="keep-open metric-select" {{action selectComponents component
target="view"}}>
                       {{view App.JqueryChosenView optionsBinding="component.metrics" elementIdBinding="component.id"
selectionObjBinding="view.metricsSelectionObj"}}
                   </li>
-                  <!--select aggregare function -->
+                  <!--select aggregator function -->
                   <li {{bindAttr class=":keep-open :aggregator-select component.showAggregateSelect::hidden"}}
                     {{action selectComponents component target="view"}}
                     {{translateAttr data-original-title="dashboard.widgets.wizard.step2.aggregateTooltip"}}>

http://git-wip-us.apache.org/repos/asf/ambari/blob/7d2a1310/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 1c56fe5..bb6171d 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
@@ -242,6 +242,7 @@ App.AddMetricExpressionView = Em.View.extend({
     var self = this;
     return Em.Object.create({
       placeholder_text: Em.I18n.t('dashboard.widgets.wizard.step2.aggregateFunction.scanOps'),
+      no_results_text: Em.I18n.t('dashboard.widgets.wizard.step2.aggregateFunction.notFound'),
       onChangeCallback: function (event, obj) {
         self.set('currentSelectedComponent.selectedAggregation', obj.selected);
       }


Mime
View raw message