Author: solomax
Date: Mon May 19 13:49:28 2014
New Revision: 1595906
URL: http://svn.apache.org/r1595906
Log:
[OPENMEETINGS-1004] user search works as expected
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java?rev=1595906&r1=1595905&r2=1595906&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
Mon May 19 13:49:28 2014
@@ -107,7 +107,7 @@ public class AbstractUserDao {
}
private String getAdditionalWhere(boolean excludeContacts) {
- return !excludeContacts ? null : "(u.type <> :contact OR
(u.type = :contact AND u.ownerId = :ownerId))";
+ return excludeContacts ? "(u.type <> :contact OR (u.type =
:contact AND u.ownerId = :ownerId))" : null;
}
private void setAdditionalParams(TypedQuery<?> q, boolean
excludeContacts, long currentUserId) {
@@ -430,15 +430,15 @@ public class AbstractUserDao {
StringBuilder sb = new StringBuilder("SELECT ");
sb.append(count ? "COUNT(" : "").append("u").append(count ? ")
" : " ")
.append("FROM User u WHERE u.deleted = false AND ")
- .append(getAdditionalWhere(false));
+ .append(getAdditionalWhere(true));
if (offers != null && offers.length() != 0) {
- sb.append("AND (LOWER(u.userOffers) LIKE :userOffers)
");
+ sb.append(" AND (LOWER(u.userOffers) LIKE :userOffers)
");
}
if (search != null && search.length() != 0) {
- sb.append("AND (LOWER(u.userSearchs) LIKE :userSearchs)
");
+ sb.append(" AND (LOWER(u.userSearchs) LIKE
:userSearchs) ");
}
if (text != null && text.length() != 0) {
- sb.append("AND (LOWER(u.login) LIKE :search ")
+ sb.append(" AND (LOWER(u.login) LIKE :search ")
.append("OR LOWER(u.firstname) LIKE :search ")
.append("OR LOWER(u.lastname) LIKE :search ")
.append("OR LOWER(u.adresses.email) LIKE
:search ")
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java?rev=1595906&r1=1595905&r2=1595906&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
Mon May 19 13:49:28 2014
@@ -107,7 +107,7 @@ public class AbstractUserDao {
}
private String getAdditionalWhere(boolean excludeContacts) {
- return !excludeContacts ? null : "(u.type <> :contact OR
(u.type = :contact AND u.ownerId = :ownerId))";
+ return excludeContacts ? "(u.type <> :contact OR (u.type =
:contact AND u.ownerId = :ownerId))" : null;
}
private void setAdditionalParams(TypedQuery<?> q, boolean
excludeContacts, long currentUserId) {
@@ -430,15 +430,15 @@ public class AbstractUserDao {
StringBuilder sb = new StringBuilder("SELECT ");
sb.append(count ? "COUNT(" : "").append("u").append(count ? ")
" : " ")
.append("FROM User u WHERE u.deleted = false AND ")
- .append(getAdditionalWhere(false));
+ .append(getAdditionalWhere(true));
if (offers != null && offers.length() != 0) {
- sb.append("AND (LOWER(u.userOffers) LIKE :userOffers)
");
+ sb.append(" AND (LOWER(u.userOffers) LIKE :userOffers)
");
}
if (search != null && search.length() != 0) {
- sb.append("AND (LOWER(u.userSearchs) LIKE :userSearchs)
");
+ sb.append(" AND (LOWER(u.userSearchs) LIKE
:userSearchs) ");
}
if (text != null && text.length() != 0) {
- sb.append("AND (LOWER(u.login) LIKE :search ")
+ sb.append(" AND (LOWER(u.login) LIKE :search ")
.append("OR LOWER(u.firstname) LIKE :search ")
.append("OR LOWER(u.lastname) LIKE :search ")
.append("OR LOWER(u.adresses.email) LIKE
:search ")
