ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AAMBARI-6330 Put host in maint. mode, doesn't filter. (ababiichuk)
Date Tue, 01 Jul 2014 10:31:30 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 54e99f6f2 -> 3fd60f31e


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3fd60f31
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3fd60f31
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3fd60f31

Branch: refs/heads/trunk
Commit: 3fd60f31ee59416aaa4777481b31140e204b991f
Parents: 54e99f6
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Tue Jul 1 13:24:47 2014 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Tue Jul 1 13:24:47 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/host.js | 12 +-----------
 ambari-web/app/data/host/categories.js  |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3fd60f31/ambari-web/app/controllers/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host.js b/ambari-web/app/controllers/main/host.js
index 6734a3e..8753a36 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/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");

http://git-wip-us.apache.org/repos/asf/ambari/blob/3fd60f31/ambari-web/app/data/host/categories.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/host/categories.js b/ambari-web/app/data/host/categories.js
index 5e4f6dc..0bd4d7a 100644
--- a/ambari-web/app/data/host/categories.js
+++ b/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']
   }
 ];


Mime
View raw message