svn commit: r1517751 - in /openmeetings/trunk/singlewebapp: build.properties src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java

[so...@apache.org]

Author: solomax
Date: Tue Aug 27 05:15:26 2013
New Revision: 1517751

URL: http://svn.apache.org/r1517751
Log:
[OPENMEETINGS-769] Enter to the room link is added back

Modified:
    openmeetings/trunk/singlewebapp/build.properties
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java

Modified: openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1517751&r1=1517750&r2=1517751&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Tue Aug 27 05:15:26 2013
@@ -21,4 +21,3 @@ laszlo.proxied=solo
 wicket.mode=DEPLOYMENT
 backup.file.list=backup_v_1_4_rc1_r3326.zip,backup_v_1_5_rc1_r3393.zip,backup_v_1_6_2_r3675.zip,backup_v_1_7_0_r3822.zip,backup_v_1_8_8_r4555.zip,backup_v_1_9_1_r4707.zip,backup_v_2_0_0_r1361497.zip
 db=derby
-

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1517751&r1=1517750&r2=1517751&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Tue Aug 27 05:15:26 2013
@@ -40,6 +40,8 @@ import org.apache.openmeetings.persisten
 import org.apache.openmeetings.persistence.beans.room.Room;
 import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.openmeetings.web.user.rooms.RoomEnterBehavior;
 import org.apache.openmeetings.web.util.RoomTypeDropDown;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -73,14 +75,14 @@ import com.googlecode.wicket.jquery.ui.w
 
 
 public class AppointmentDialog extends AbstractFormDialog<Appointment> {
-	
+	private static final long serialVersionUID = 1L;
 	private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey);
 	
-	private static final long serialVersionUID = 7553035786264113827L;
 	private AppointmentForm form;
 	private DialogButton save = new DialogButton(WebSession.getString(813));
 	private DialogButton cancel = new DialogButton(WebSession.getString(1130));
 	private DialogButton delete = new DialogButton(WebSession.getString(814));
+	private DialogButton enterRoom = new DialogButton(WebSession.getString(1282));
 	private final CalendarPanel calendar;
 	protected final FeedbackPanel feedback;
 	final MeetingMemberDialog addAttendees;
@@ -98,8 +100,10 @@ public class AppointmentDialog extends A
 		log.debug(" -- setModelObjectWithAjaxTarget -- Current model " + object);
 		if (object.getAppointmentId() != null) {
 			delete.setVisible(true, target);
+			enterRoom.setVisible(object.getRoom() != null, target);
 		} else {
 			delete.setVisible(false, target);
+			enterRoom.setVisible(false, target);
 		}
 		super.setModelObject(object);
 	}
@@ -133,7 +137,7 @@ public class AppointmentDialog extends A
 
 	@Override
 	protected List<DialogButton> getButtons() {
-		return Arrays.asList(save, delete, cancel);
+		return Arrays.asList(enterRoom, save, delete, cancel);
 	}
 	
 	@Override
@@ -155,6 +159,8 @@ public class AppointmentDialog extends A
 	public void onClose(AjaxRequestTarget target, DialogButton button) {
 		if (delete.equals(button)) {
 			confirmDelete.open(target);
+		} else if (enterRoom.equals(button)) {
+			RoomEnterBehavior.roomEnter((MainPage)getPage(), target, getModelObject().getRoom().getRooms_id());
 		}
 	}
 	

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java?rev=1517751&r1=1517750&r2=1517751&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java Tue Aug 27 05:15:26 2013
@@ -33,8 +33,12 @@ public class RoomEnterBehavior extends A
 		this.roomid = roomid;
 	}
 
+	public static void roomEnter(MainPage page, AjaxRequestTarget target, long roomId) {
+		page.updateContents(new OmUrlFragment(AreaKeys.room, "" + roomId), target);
+	}
+	
 	@Override
 	protected void onEvent(AjaxRequestTarget target) {
-		((MainPage)getComponent().getPage()).updateContents(new OmUrlFragment(AreaKeys.room, "" + roomid), target);
+		roomEnter((MainPage)getComponent().getPage(), target, roomid);
 	}
 }