cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/master to e53081f
Date Wed, 18 Dec 2013 01:09:35 GMT
Updated Branches:
  refs/heads/master e54d1dec9 -> e53081fe2


CLOUDSTACK-5534: MySQL exception raised when searching for users with
keyword.


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

Branch: refs/heads/master
Commit: e53081fe26291ade2187b9b57f74467a896fafb1
Parents: e54d1de
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Dec 17 16:54:37 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Tue Dec 17 16:58:22 2013 -0800

----------------------------------------------------------------------
 server/src/com/cloud/api/query/QueryManagerImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e53081fe/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 9122276..8ae5159 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -424,8 +424,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService
{
             ssc.addOr("email", SearchCriteria.Op.LIKE, "%" + keyword + "%");
             ssc.addOr("state", SearchCriteria.Op.LIKE, "%" + keyword + "%");
             ssc.addOr("accountName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
-            ssc.addOr("type", SearchCriteria.Op.LIKE, "%" + keyword + "%");
-            ssc.addOr("accountState", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+            ssc.addOr("accountType", SearchCriteria.Op.LIKE, "%" + keyword + "%");
 
             sc.addAnd("username", SearchCriteria.Op.SC, ssc);
         }


Mime
View raw message