Quellcode durchsuchen

AMBARI-11322. Graph Zoom in tooltip should be consistent on different pages.(XIWANG)

Xi Wang vor 10 Jahren
Ursprung
Commit
0c67a83cec

+ 8 - 0
ambari-web/app/views/common/widget/graph_widget_view.js

@@ -321,6 +321,14 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, {
 
     didInsertElement: function () {
       this.loadData();
+      var self = this;
+      Em.run.next(function () {
+        if (self.get('isPreview')) {
+          App.tooltip(this.$("[rel='ZoomInTooltip']"), 'disable');
+        } else {
+          App.tooltip(this.$("[rel='ZoomInTooltip']"), {placement : 'left'});
+        }
+      });
     }.observes('parentView.data')
   })
 });

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js

@@ -33,7 +33,7 @@ App.ChartClusterMetricsCPU = App.ChartLinearTimeView.extend({
 
   title: Em.I18n.t('dashboard.clusterMetrics.cpu'),
   yAxisFormatter: App.ChartLinearTimeView.PercentageFormatter,
-  isTimePagingDisable: true,
+  isTimePagingDisable: false,
   transformToSeries: function (jsonData) {
     var seriesArray = [];
     var idle = null;

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/load.js

@@ -31,7 +31,7 @@ App.ChartClusterMetricsLoad = App.ChartLinearTimeView.extend({
   id: "cluster-metrics-load",
 
   ajaxIndex: 'dashboard.cluster_metrics.load',
-  isTimePagingDisable: true,
+  isTimePagingDisable: false,
   renderer: 'line',
   title: Em.I18n.t('dashboard.clusterMetrics.load'),
   

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/memory.js

@@ -31,7 +31,7 @@ App.ChartClusterMetricsMemory = App.ChartLinearTimeView.extend({
 
   ajaxIndex: 'dashboard.cluster_metrics.memory',
 
-  isTimePagingDisable: true,
+  isTimePagingDisable: false,
   title: Em.I18n.t('dashboard.clusterMetrics.memory'),
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
   renderer: 'line',

+ 1 - 1
ambari-web/app/views/main/dashboard/cluster_metrics/network.js

@@ -32,7 +32,7 @@ App.ChartClusterMetricsNetwork = App.ChartLinearTimeView.extend({
 
   ajaxIndex: 'dashboard.cluster_metrics.network',
 
-  isTimePagingDisable: true,
+  isTimePagingDisable: false,
   title: Em.I18n.t('dashboard.clusterMetrics.network'),
   yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
   renderer: 'line',