浏览代码

AAMBARI-6330 Put host in maint. mode, doesn't filter. (ababiichuk)

aBabiichuk 11 年之前
父节点
当前提交
3fd60f31ee
共有 2 个文件被更改,包括 2 次插入12 次删除
  1. 1 11
      ambari-web/app/controllers/main/host.js
  2. 1 1
      ambari-web/app/data/host/categories.js

+ 1 - 11
ambari-web/app/controllers/main/host.js

@@ -131,7 +131,7 @@ App.MainHostController = Em.ArrayController.extend({
     {
       key: 'componentsInPassiveStateCount',
       alias: 'host_components/HostRoles/maintenance_state',
-      type: 'EQUAL'
+      type: 'MULTIPLE'
     },
     {
       key: 'selected',
@@ -495,16 +495,6 @@ App.MainHostController = Em.ArrayController.extend({
     App.db.setFilterConditions(this.get('name'), [filterForComponent]);
   },
 
-  /**
-   * On click callback for delete button
-   */
-  deleteButtonPopup: function () {
-    var self = this;
-    App.showConfirmationPopup(function () {
-      self.removeHosts();
-    });
-  },
-
   showAlertsPopup: function (event) {
     var host = event.context;
     App.router.get('mainAlertsController').loadAlerts(host.get('hostName'), "HOST");

+ 1 - 1
ambari-web/app/data/host/categories.js

@@ -84,6 +84,6 @@ module.exports = [
     healthStatus: 'health-status-PASSIVE_STATE',
     column: 9,
     type: 'string',
-    filterValue: 'ON'
+    filterValue: ['ON','IMPLIED_FROM_HOST','IMPLIED_FROM_SERVICE','IMPLIED_FROM_SERVICE_AND_HOST']
   }
 ];