Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DEAC71002B for ; Tue, 24 Sep 2013 18:19:12 +0000 (UTC) Received: (qmail 2408 invoked by uid 500); 24 Sep 2013 18:19:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 2302 invoked by uid 500); 24 Sep 2013 18:19:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 2012 invoked by uid 99); 24 Sep 2013 18:19:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Sep 2013 18:19:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 498E2908D15; Tue, 24 Sep 2013 18:19:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Tue, 24 Sep 2013 18:19:12 -0000 Message-Id: <8bf860158ee948c282f9f62f7f72c628@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/19] git commit: updated refs/heads/ui-restyle to 4b63867 CLOUDSTACK-4732: search network name for virtual router when listRouters by keyword Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/98c79cc3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/98c79cc3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/98c79cc3 Branch: refs/heads/ui-restyle Commit: 98c79cc3138a1c2e3d85ce1f04c4431ba99272bd Parents: 5ada5e8 Author: Wei Zhou Authored: Tue Sep 24 15:01:14 2013 +0200 Committer: Wei Zhou Committed: Tue Sep 24 15:01:14 2013 +0200 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 1 + ui/scripts/system.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98c79cc3/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 0613c59..be52f29 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1146,6 +1146,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("state", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + ssc.addOr("networkName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); sc.addAnd("instanceName", SearchCriteria.Op.SC, ssc); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98c79cc3/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 1ddbc21..77c387c 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7049,7 +7049,7 @@ var listView = $.extend(true, {}, cloudStack.sections.system.subsections.virtualRouters.listView, { dataProvider: function(args) { var searchByArgs = args.filterBy.search.value.length ? - '&name=' + args.filterBy.search.value : ''; + '&keyword=' + args.filterBy.search.value : ''; var routers = []; $.ajax({