You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/12/18 01:56:11 UTC
git commit: updated refs/heads/4.3 to d0abf3f
Updated Branches:
refs/heads/4.3 8cb51dcc8 -> d0abf3fcc
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/d0abf3fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0abf3fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0abf3fc
Branch: refs/heads/4.3
Commit: d0abf3fcc2fde147038c75da2ea4d0c744a8127a
Parents: 8cb51dc
Author: Min Chen <mi...@citrix.com>
Authored: Tue Dec 17 16:54:37 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Dec 17 16:55:49 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/d0abf3fc/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 58df38c..37c2ef6 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);
}