Author: solomax
Date: Fri Oct 19 13:16:15 2012
New Revision: 1400085
URL: http://svn.apache.org/viewvc?rev=1400085&view=rev
Log:
Old client is fixed (user count was broken)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java?rev=1400085&r1=1400084&r2=1400085&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
Fri Oct 19 13:16:15 2012
@@ -79,17 +79,17 @@ public class RoomDAO implements OmDAO<Ro
public List<Rooms> getPublicRooms() {
//TypedQuery<Rooms> q =
em.createNamedQuery("getNondeletedRooms", Rooms.class);
TypedQuery<Rooms> q = em.createQuery(
- "SELECT r from Rooms r LEFT JOIN FETCH
r.currentusers WHERE r.ispublic= true and r.deleted= false ORDER BY r.name
ASC", Rooms.class);
+ "SELECT r from Rooms r LEFT JOIN FETCH
r.currentusers WHERE r.ispublic= true AND r.deleted= false AND r.appointment =
false ORDER BY r.name ASC", Rooms.class);
return q.getResultList();
}
public List<Rooms> getOrganisationRooms(long orgId) {
TypedQuery<Rooms> q = em.createQuery(
"SELECT DISTINCT c.room FROM Rooms_Organisation
c LEFT JOIN FETCH c.room LEFT JOIN FETCH c.room.currentusers "
- + "WHERE c.organisation.organisation_id = :orgId "
- + "AND c.deleted = false AND c.room.deleted = false "
- + "AND c.organisation.deleted = false "
- + "ORDER BY c.room.name ASC", Rooms.class);
+ + "WHERE c.organisation.organisation_id =
:orgId "
+ + "AND c.deleted = false AND c.room.deleted =
false "
+ + "AND c.organisation.deleted = false "
+ + "ORDER BY c.room.name ASC", Rooms.class);
q.setParameter("orgId", orgId);
return q.getResultList();
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1400085&r1=1400084&r2=1400085&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
Fri Oct 19 13:16:15 2012
@@ -1000,9 +1000,9 @@ public class Roommanagement {
if (authLevelManagement.checkUserLevel(user_level)) {
String hql = "SELECT c FROM Rooms_Organisation
c "
- + "LEFT JOIN FETCH c.room "
+ + "LEFT JOIN FETCH c.room LEFT
JOIN FETCH c.room.currentusers "
+ "WHERE
c.organisation.organisation_id = :organisation_id "
- + "AND c.deleted <> :deleted
AND c.room.deleted <> :deleted "
+ + "AND c.deleted <> :deleted
AND c.room.deleted <> :deleted AND c.room.appointment = false "
+ "AND c.organisation.deleted
<> :deleted "
+ "ORDER BY c.room.name ASC";
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1400085&r1=1400084&r2=1400085&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
Fri Oct 19 13:16:15 2012
@@ -89,15 +89,15 @@ public class Rooms implements Serializab
@Column(name = "ispublic")
@Element(data = true, required = false)
- private Boolean ispublic;
+ private boolean ispublic;
@Column(name = "numberOfPartizipants")
@Element(data = true)
private Long numberOfPartizipants = new Long(4);
- @Column(name = "appointMent")
+ @Column(name = "appointment")
@Element(data = true)
- private Boolean appointment;
+ private boolean appointment;
// Vars to simulate external Rooms
@Column(name = "externalRoomId")
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1400085&r1=1400084&r2=1400085&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
Fri Oct 19 13:16:15 2012
@@ -142,24 +142,7 @@ public class ConferenceService {
.getRoomsOrganisationByOrganisationId(user_level,
organisation_id);
- if (roomOrgsList == null) {
- return null;
- }
-
- List<Rooms_Organisation> filtered = new
ArrayList<Rooms_Organisation>();
-
- for (Iterator<Rooms_Organisation> iter =
roomOrgsList.iterator(); iter
- .hasNext();) {
- Rooms_Organisation orgRoom = iter.next();
-
- if (!orgRoom.getRoom().getAppointment()) {
- orgRoom.getRoom().setCurrentusers(
-
this.getRoomClientsListByRoomId(orgRoom.getRoom()
-
.getRooms_id()));
- filtered.add(orgRoom);
- }
- }
- return filtered;
+ return roomOrgsList;
} catch (Exception err) {
log.error("[getRoomsByOrganisationAndType]", err);
}
@@ -233,27 +216,9 @@ public class ConferenceService {
Long user_level =
userManagement.getUserLevelByID(users_id);
log.debug("getRoomsPublic user_level: " + user_level);
- List<Rooms> roomList = roommanagement
- .getPublicRoomsWithoutType(user_level);
-
- if (roomList == null) {
- return null;
- }
-
- // Filter : no appointed meetings
- List<Rooms> filtered = new ArrayList<Rooms>();
+ List<Rooms> roomList = roomDao.getPublicRooms();
- for (Iterator<Rooms> iter = roomList.iterator();
iter.hasNext();) {
- Rooms rooms = iter.next();
-
- if (!rooms.getAppointment()) {
-
rooms.setCurrentusers(this.getRoomClientsListByRoomId(rooms
- .getRooms_id()));
- filtered.add(rooms);
- }
- }
-
- return filtered;
+ return roomList;
} catch (Exception err) {
log.error("[getRoomsPublicWithoutType]", err);
}
