Author: vdegtyarev
Date: Thu Apr 3 06:05:39 2014
New Revision: 1584265
URL: http://svn.apache.org/r1584265
Log:
Merge OPENMEETINGS-917 minor changes to trunk.
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1584265&r1=1584264&r2=1584265&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
Thu Apr 3 06:05:39 2014
@@ -37,7 +37,7 @@ public class UserDao {
}
public List<User> get(String search, long currentUserId) {
- return dao.get(search, false, currentUserId);
+ return dao.get(search, true, currentUserId);
}
public List<User> get(String search, int start, int count, String
order, long currentUserId) {
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1584265&r1=1584264&r2=1584265&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
Thu Apr 3 06:05:39 2014
@@ -93,7 +93,7 @@ public class GroupsPanel extends AdminPa
}
};
add(form.add(addUsersBtn.setOutputMarkupId(true)));
- addUsersDialog = new
AddUsersDialog("addUsers",WebSession.getString(180), form, false);
+ addUsersDialog = new
AddUsersDialog("addUsers",WebSession.getString(180), form, true);
add(addUsersDialog.setOutputMarkupId(true));
//List view
