Author: solomax
Date: Sun Feb 2 06:48:35 2014
New Revision: 1563568
URL: http://svn.apache.org/r1563568
Log:
[OPENMEETINGS-900] Deleted contacts are not being displayed while inviting
external guests
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.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=1563568&r1=1563567&r2=1563568&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
Sun Feb 2 06:48:35 2014
@@ -105,7 +105,7 @@ public class AbstractUserDao {
}
private String getAdditionalWhere(boolean isAdmin){
- return isAdmin ? null : "u.type <> :contact OR (u.type =
:contact AND u.ownerId = :ownerId)";
+ return isAdmin ? null : "(u.type <> :contact OR (u.type =
:contact AND u.ownerId = :ownerId))";
}
private void setAdditionalParams(TypedQuery<?> q, boolean isAdmin, long
currentUserId){
Modified:
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java?rev=1563568&r1=1563567&r2=1563568&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
(original)
+++
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
Sun Feb 2 06:48:35 2014
@@ -33,30 +33,16 @@ public class DaoHelper {
} else {
sb.append(alias);
}
- sb.append(" FROM ").append(table).append(" ").append(alias);
- boolean whereAdded = false;
+ sb.append(" FROM ").append(table).append("
").append(alias).append(" WHERE 1 = 1 ");
if (filterDeleted) {
- whereAdded = true;
- sb.append(" WHERE ").append(alias).append(".deleted =
false ");
+ sb.append("AND ").append(alias).append(".deleted =
false ");
}
StringBuilder where = DaoHelper.getWhereClause(search, alias,
fields);
if (where.length() > 0) {
- if (!whereAdded) {
- whereAdded = true;
- sb.append(" WHERE ");
- } else {
- sb.append("AND ");
- }
- sb.append(where);
+ sb.append("AND ").append(where);
}
if (additionalWhere != null &&
!additionalWhere.trim().isEmpty()) {
- if (!whereAdded) {
- whereAdded = true;
- sb.append(" WHERE ");
- } else {
- sb.append("AND ");
- }
- sb.append(additionalWhere);
+ sb.append("AND ").append(additionalWhere);
}
if (sort != null && !sort.trim().isEmpty()) {
sb.append(" ORDER BY
").append(alias).append(".").append(sort);
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java?rev=1563568&r1=1563567&r2=1563568&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
Sun Feb 2 06:48:35 2014
@@ -105,7 +105,7 @@ public class AbstractUserDao {
}
private String getAdditionalWhere(boolean isAdmin){
- return isAdmin ? null : "u.type <> :contact OR (u.type =
:contact AND u.ownerId = :ownerId)";
+ return isAdmin ? null : "(u.type <> :contact OR (u.type =
:contact AND u.ownerId = :ownerId))";
}
private void setAdditionalParams(TypedQuery<?> q, boolean isAdmin, long
currentUserId){
Modified:
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java?rev=1563568&r1=1563567&r2=1563568&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/DaoHelper.java
Sun Feb 2 06:48:35 2014
@@ -33,30 +33,16 @@ public class DaoHelper {
} else {
sb.append(alias);
}
- sb.append(" FROM ").append(table).append(" ").append(alias);
- boolean whereAdded = false;
+ sb.append(" FROM ").append(table).append("
").append(alias).append(" WHERE 1 = 1 ");
if (filterDeleted) {
- whereAdded = true;
- sb.append(" WHERE ").append(alias).append(".deleted =
false ");
+ sb.append("AND ").append(alias).append(".deleted =
false ");
}
StringBuilder where = DaoHelper.getWhereClause(search, alias,
fields);
if (where.length() > 0) {
- if (!whereAdded) {
- whereAdded = true;
- sb.append(" WHERE ");
- } else {
- sb.append("AND ");
- }
- sb.append(where);
+ sb.append("AND ").append(where);
}
if (additionalWhere != null &&
!additionalWhere.trim().isEmpty()) {
- if (!whereAdded) {
- whereAdded = true;
- sb.append(" WHERE ");
- } else {
- sb.append("AND ");
- }
- sb.append(additionalWhere);
+ sb.append("AND ").append(additionalWhere);
}
if (sort != null && !sort.trim().isEmpty()) {
sb.append(" ORDER BY
").append(alias).append(".").append(sort);
