You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2014/04/01 10:23:51 UTC
svn commit: r1583566 - in /openmeetings/branches/3.0.x/src:
db/java/org/apache/openmeetings/db/dao/user/
test/java/org/apache/openmeetings/test/user/
web/java/org/apache/openmeetings/web/admin/
web/java/org/apache/openmeetings/web/admin/groups/ web/jav...
Author: vdegtyarev
Date: Tue Apr 1 08:23:51 2014
New Revision: 1583566
URL: http://svn.apache.org/r1583566
Log:
OPENMEETINGS-917 is fixed. Contacts are not added as default moderator to rooms.
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.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=1583566&r1=1583565&r2=1583566&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 Tue Apr 1 08:23:51 2014
@@ -106,12 +106,12 @@ public class AbstractUserDao {
return q.getResultList();
}
- private String getAdditionalWhere(boolean isAdmin) {
- return isAdmin ? null : "(u.type <> :contact OR (u.type = :contact AND u.ownerId = :ownerId))";
+ private String getAdditionalWhere(boolean excludeContacts) {
+ return !excludeContacts ? null : "(u.type <> :contact OR (u.type = :contact AND u.ownerId = :ownerId))";
}
- private void setAdditionalParams(TypedQuery<?> q, boolean isAdmin, long currentUserId) {
- if (!isAdmin) {
+ private void setAdditionalParams(TypedQuery<?> q, boolean excludeContacts, long currentUserId) {
+ if (excludeContacts) {
q.setParameter("ownerId", currentUserId);
q.setParameter("contact", Type.contact);
}
@@ -131,15 +131,15 @@ public class AbstractUserDao {
return q.getSingleResult();
}
- public long count(String search, boolean isAdmin, long currentUserId) {
- TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, true, getAdditionalWhere(isAdmin), null, searchFields), Long.class);
- setAdditionalParams(q, isAdmin, currentUserId);
+ public long count(String search, boolean excludeContacts, long currentUserId) {
+ TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, true, getAdditionalWhere(excludeContacts), null, searchFields), Long.class);
+ setAdditionalParams(q, excludeContacts, currentUserId);
return q.getSingleResult();
}
- public List<User> get(String search, boolean isAdmin, long currentUserId) {
- TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, getAdditionalWhere(isAdmin), null, searchFields), User.class);
- if (!isAdmin) {
+ public List<User> get(String search, boolean excludeContacts, long currentUserId) {
+ TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, getAdditionalWhere(excludeContacts), null, searchFields), User.class);
+ if (excludeContacts) {
q.setParameter("ownerId", currentUserId);
q.setParameter("contact", Type.contact);
}
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java?rev=1583566&r1=1583565&r2=1583566&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java Tue Apr 1 08:23:51 2014
@@ -45,8 +45,8 @@ public class AdminUserDao implements IDa
return dao.get(search, start, count, order, true, -1);
}
- public List<User> get(String search) {
- return dao.get(search, true, -1);
+ public List<User> get(String search, boolean excludeContacts) {
+ return dao.get(search, excludeContacts, -1);
}
public long count() {
Modified: openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java?rev=1583566&r1=1583565&r2=1583566&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java (original)
+++ openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java Tue Apr 1 08:23:51 2014
@@ -51,7 +51,7 @@ public class TestUserContact extends Abs
Random random = new Random();
User contact = createUserContact(random.nextInt(), getUserId());
String email = contact.getAdresses().getEmail();
- List<User> l = adminUserDao.get(email);
+ List<User> l = adminUserDao.get(email, false);
// check that contact is visible for admin
assertNotNull("Contact list should not be null for admin ", l);
assertFalse("Contact list should not be empty for admin ", l.isEmpty());
@@ -61,7 +61,7 @@ public class TestUserContact extends Abs
assertTrue("Contact list should not be empty for owner ", !l.isEmpty());
//delete contact
adminUserDao.delete(contact, getUserId());
- l = adminUserDao.get(email);
+ l = adminUserDao.get(email, false);
assertTrue("Contact list should be empty after deletion", l.isEmpty());
User u = createUser(random.nextInt());
@@ -73,7 +73,7 @@ public class TestUserContact extends Abs
assertTrue("Contact list should be empty for another user", l.isEmpty());
//delete contact
adminUserDao.delete(contact, u.getUser_id());
- l = adminUserDao.get(email);
+ l = adminUserDao.get(email, false);
assertTrue("Contact list should be empty after deletion", l.isEmpty());
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java?rev=1583566&r1=1583565&r2=1583566&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/AddUsersDialog.java Tue Apr 1 08:23:51 2014
@@ -69,7 +69,7 @@ public class AddUsersDialog extends Abst
private final DialogButton send = new DialogButton(WebSession.getString(175));
private final DialogButton cancel = new DialogButton(WebSession.getString(219));
- public AddUsersDialog(String id, String title, AdminCommonUserForm<?> commonForm) {
+ public AddUsersDialog(String id, String title, AdminCommonUserForm<?> commonForm, final boolean excludeContacts) {
super(id, title, true);
formUsers = new Form<User>("formUsers", getModel());
this.commonForm = commonForm;
@@ -82,7 +82,7 @@ public class AddUsersDialog extends Abst
protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) {
listUsersModel.getObject().clear();
selectedUsersModel.getObject().clear();
- listUsersModel.getObject().addAll(Application.getBean(AdminUserDao.class).get(userSearchText));
+ listUsersModel.getObject().addAll(Application.getBean(AdminUserDao.class).get(userSearchText, excludeContacts));
target.add(users);
}
});
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1583566&r1=1583565&r2=1583566&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Tue Apr 1 08:23:51 2014
@@ -93,7 +93,7 @@ public class GroupsPanel extends AdminPa
}
};
add(form.add(addUsersBtn.setOutputMarkupId(true)));
- addUsersDialog = new AddUsersDialog("addUsers",WebSession.getString(180), form);
+ addUsersDialog = new AddUsersDialog("addUsers",WebSession.getString(180), form, false);
add(addUsersDialog.setOutputMarkupId(true));
//List view
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1583566&r1=1583565&r2=1583566&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Tue Apr 1 08:23:51 2014
@@ -116,6 +116,6 @@ public class RoomsPanel extends AdminPan
};
add(form.add(addModerator.setOutputMarkupId(true)));
- add(addModeratorsDialog = new AddUsersDialog("addModerators", WebSession.getString(821), form));
+ add(addModeratorsDialog = new AddUsersDialog("addModerators", WebSession.getString(821), form, true));
}
}