CLOUDSTACK-4732: search network name for virtual router when listRouters by keyword (cherry picked from commit 98c79cc3138a1c2e3d85ce1f04c4431ba99272bd)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5225bd43 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5225bd43 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5225bd43 Branch: refs/heads/4.2 Commit: 5225bd434cfce108913e06f842630e346496fcb2 Parents: a206f42 Author: Wei Zhou <w.z...@leaseweb.com> Authored: Tue Sep 24 15:01:14 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Tue Sep 24 15:01:53 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/5225bd43/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 86276b3..6104ec0 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1144,6 +1144,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/5225bd43/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({
