Ver Fonte

AMBARI-1452. Graphs look broken when network connectivity is lost between Ambari Web and Ambari Server. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1448436 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako há 12 anos atrás
pai
commit
79a57e7ef6
2 ficheiros alterados com 14 adições e 2 exclusões
  1. 3 0
      CHANGES.txt
  2. 11 2
      ambari-web/app/views/common/chart/linear_time.js

+ 3 - 0
CHANGES.txt

@@ -298,6 +298,9 @@ Trunk (unreleased changes):
 
 
  BUG FIXES
  BUG FIXES
 
 
+ AMBARI-1452. Graphs look broken when network connectivity is lost between
+ Ambari Web and Ambari Server. (yusaku)
+
  AMBARI-1441. Validation for username used in service configs is broken.
  AMBARI-1441. Validation for username used in service configs is broken.
  (yusaku)
  (yusaku)
 
 

+ 11 - 2
ambari-web/app/views/common/chart/linear_time.js

@@ -173,9 +173,18 @@ App.ChartLinearTimeView = Ember.View.extend({
    * @type: Function
    * @type: Function
    */
    */
   _showMessage: function(type, title, message){
   _showMessage: function(type, title, message){
-    var chartOverlayId = '#' + this.id + '-chart';
+    var chartOverlay = '#' + this.id;
+    var chartOverlayId = chartOverlay + '-chart';
+    var chartOverlayY = chartOverlay + '-yaxis';
+    var chartOverlayX = chartOverlay + '-xaxis';
+    var chartOverlayLegend = chartOverlay + '-legend';
+    var chartOverlayTimeline = chartOverlay + '-timeline';
     if (this.get('isPopup')) {
     if (this.get('isPopup')) {
       chartOverlayId += this.get('popupSuffix');
       chartOverlayId += this.get('popupSuffix');
+      chartOverlayY += this.get('popupSuffix');
+      chartOverlayX += this.get('popupSuffix');
+      chartOverlayLegend += this.get('popupSuffix');
+      chartOverlayTimeline += this.get('popupSuffix');
     }
     }
     var typeClass;
     var typeClass;
     switch (type) {
     switch (type) {
@@ -192,7 +201,7 @@ App.ChartLinearTimeView = Ember.View.extend({
         typeClass = '';
         typeClass = '';
         break;
         break;
     }
     }
-    $(chartOverlayId).html('');
+    $(chartOverlayId+', '+chartOverlayY+', '+chartOverlayX+', '+chartOverlayLegend+', '+chartOverlayTimeline).html('');
     $(chartOverlayId).append('<div class=\"alert '+typeClass+'\"><strong>'+title+'</strong> '+message+'</div>');
     $(chartOverlayId).append('<div class=\"alert '+typeClass+'\"><strong>'+title+'</strong> '+message+'</div>');
   },
   },