This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 9a81c82 AMBARI-24645 Issues with tooltip containing custom time range for charts. (ababiichuk) 9a81c82 is described below commit 9a81c820816df788493cc43e37de4d33e01ddc3a Author: ababiichuk <ababiic...@hortonworks.com> AuthorDate: Fri Sep 14 19:19:50 2018 +0300 AMBARI-24645 Issues with tooltip containing custom time range for charts. (ababiichuk) --- ambari-web/app/mixins/common/widgets/time_range_mixin.js | 4 +++- .../main/service/info/metrics/flume/flume_agent_metrics_section.hbs | 4 +--- ambari-web/app/views/main/service/info/metrics_view.js | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ambari-web/app/mixins/common/widgets/time_range_mixin.js b/ambari-web/app/mixins/common/widgets/time_range_mixin.js index 0553a8e..ab00bf4 100644 --- a/ambari-web/app/mixins/common/widgets/time_range_mixin.js +++ b/ambari-web/app/mixins/common/widgets/time_range_mixin.js @@ -79,7 +79,9 @@ App.TimeRangeMixin = Em.Mixin.create({ didInsertElement: function () { App.tooltip(this.$(), { - selector: '.dropdown-toggle[rel="tooltip"]' + selector: '.dropdown-toggle[rel="tooltip"]', + html: true, + placement: 'left' }); }, diff --git a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs index d32afdd..5289b70 100644 --- a/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs +++ b/ambari-web/app/templates/main/service/info/metrics/flume/flume_agent_metrics_section.hbs @@ -26,9 +26,7 @@ {{view.header}} </h4> </div> - {{#if showTimeRangeControl}} - {{view view.timeRangeListView}} - {{/if}} + {{view view.timeRangeListView}} <div class="clearfix"></div> </div> <div class="panel-body collapse in" {{bindAttr id="view.id"}}> diff --git a/ambari-web/app/views/main/service/info/metrics_view.js b/ambari-web/app/views/main/service/info/metrics_view.js index 450410e..e61a628 100644 --- a/ambari-web/app/views/main/service/info/metrics_view.js +++ b/ambari-web/app/views/main/service/info/metrics_view.js @@ -100,6 +100,7 @@ App.MainServiceInfoMetricsView = Em.View.extend(App.Persist, App.TimeRangeMixin, this.makeSortable('#widget_layout'); this.makeSortable('#ns_widget_layout', true); this.addWidgetTooltip(); + this._super(); }, loadActiveWidgetLayout: function () {