Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 663AB10819 for ; Fri, 27 Sep 2013 11:18:43 +0000 (UTC) Received: (qmail 33131 invoked by uid 500); 27 Sep 2013 11:18:42 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 33102 invoked by uid 500); 27 Sep 2013 11:18:36 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 33095 invoked by uid 99); 27 Sep 2013 11:18:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 11:18:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0285490BFEA; Fri, 27 Sep 2013 11:18:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: onechiporenko@apache.org To: ambari-commits@incubator.apache.org Message-Id: <6ca4f38aa7a7485a9bd2f4b52f5f7f47@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-3295. Clear host filters when landing on hosts page. (onechiporenko) Date: Fri, 27 Sep 2013 11:18:34 +0000 (UTC) Updated Branches: refs/heads/trunk c900dcaf8 -> 0960fac65 AMBARI-3295. Clear host filters when landing on hosts page. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/0960fac6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0960fac6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0960fac6 Branch: refs/heads/trunk Commit: 0960fac65d735aadaafeca42fad93b439f3f5402 Parents: c900dca Author: Oleg Nechiporenko Authored: Fri Sep 27 14:10:42 2013 +0300 Committer: Oleg Nechiporenko Committed: Fri Sep 27 14:10:42 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0960fac6/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 88bfe5b..fe1852b 100644 --- a/ambari-web/app/controllers/main/host.js +++ b/ambari-web/app/controllers/main/host.js @@ -65,21 +65,7 @@ App.MainHostController = Em.ArrayController.extend({ value: id, type: 'multiple' }; - - var filterConditions = App.db.getFilterConditions(this.get('name')); - if (filterConditions) { - var component = filterConditions.findProperty('iColumn', column); - if (component) { - component.value = id; - } - else { - filterConditions.push(filterForComponent); - } - App.db.setFilterConditions(this.get('name'), filterConditions); - } - else { - App.db.setFilterConditions(this.get('name'), [filterForComponent]); - } + App.db.setFilterConditions(this.get('name'), [filterForComponent]); }, /** * On click callback for delete button