瀏覽代碼

AMBARI-1501. Nagios alerts do not update automatically. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1450503 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 年之前
父節點
當前提交
3ed7d78272
共有 2 個文件被更改,包括 7 次插入1 次删除
  1. 2 0
      CHANGES.txt
  2. 5 1
      ambari-web/app/controllers/global/cluster_controller.js

+ 2 - 0
CHANGES.txt

@@ -376,6 +376,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1501. Nagios alerts do not update automatically. (yusaku)
+
  AMBARI-1503. Ajax call sometimes adds multiple question marks in the query
  causing bad requests. (yusaku)
 

+ 5 - 1
ambari-web/app/controllers/global/cluster_controller.js

@@ -186,9 +186,12 @@ App.ClusterController = Em.Controller.extend({
    * property, which will trigger the alerts property.
    */
   loadAlerts:function () {
+    if(App.Alert.find().content.length > 0){
+      return false;
+    }
     var self=this;
     if(App.router.get('updateController.isUpdated')){
-      return;
+      return false;
     }
     var nagiosUrl = this.get('nagiosUrl');
     if (nagiosUrl) {
@@ -214,6 +217,7 @@ App.ClusterController = Em.Controller.extend({
       this.updateLoadStatus('alerts');
       console.log("No Nagios URL provided.")
     }
+    return true;
   }.observes('nagiosUrl'),
 
   /**