You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/02/16 19:30:26 UTC

[21/50] [abbrv] ambari git commit: AMBARI-15025. Hosts page: Filtering works incorrectly with multiple filters applied (onechiporenko)

AMBARI-15025. Hosts page: Filtering works incorrectly with multiple filters applied (onechiporenko)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ddba3c5d4e2dbd7f0edf07429df4fa24bbaa2d21
Parents: 30438e9
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Feb 12 12:21:25 2016 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Feb 12 12:23:04 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/host.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ddba3c5d/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 047e19f..a38b2db 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -106,7 +106,7 @@ App.MainHostController = Em.ArrayController.extend(App.TableServerMixin, {
     },
     {
       name: 'criticalWarningAlertsCount',
-      key: 'alerts_summary/CRITICAL{0}|alerts_summary/WARNING{1}',
+      key: '(alerts_summary/CRITICAL{0}|alerts_summary/WARNING{1})',
       type: 'CUSTOM'
     },
     {