You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/10/19 17:10:33 UTC

svn commit: r1632944 - in /openmeetings/trunk/singlewebapp: openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/ openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/

Author: solomax
Date: Sun Oct 19 15:10:33 2014
New Revision: 1632944

URL: http://svn.apache.org/r1632944
Log:
[OPENMEETINGS-1109] appointments with existing room displayed as expected

Modified:
    openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java

Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1632944&r1=1632943&r2=1632944&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java Sun Oct 19 15:10:33 2014
@@ -50,6 +50,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.util.TimezoneUtil;
 import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1632944&r1=1632943&r2=1632944&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Sun Oct 19 15:10:33 2014
@@ -247,7 +247,7 @@ public class AppointmentDialog extends A
 			if (a.getRoom().getRoomtype() == null && !roomTypes.isEmpty()) {
 				a.getRoom().setRoomtype(roomTypes.get(0));
 			}
-			createRoom = Boolean.TRUE.equals(a.getRoom().getAppointment());
+			createRoom = a.getRoom().isAppointment();
 			roomType.setEnabled(createRoom);
 			room.setEnabled(!createRoom);
 			if (a.getId() == null) {