cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to 98c79cc
Date Tue, 24 Sep 2013 13:01:33 GMT
Updated Branches:
  refs/heads/master 5ada5e88f -> 98c79cc31


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/master
Commit: 98c79cc3138a1c2e3d85ce1f04c4431ba99272bd
Parents: 5ada5e8
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Sep 24 15:01:14 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
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({


Mime
View raw message