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 2013/08/23 07:57:47 UTC
svn commit: r1516705 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar:
AppointmentDialog.html AppointmentDialog.java
Author: vdegtyarev
Date: Fri Aug 23 05:57:47 2013
New Revision: 1516705
URL: http://svn.apache.org/r1516705
Log:
OPENMEETINGS-769 is fixed. Enter to the room link is added to event's popup.
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1516705&r1=1516704&r2=1516705&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Fri Aug 23 05:57:47 2013
@@ -85,7 +85,10 @@
</tr>
<tr>
<td><wicket:ommessage key="573" /></td>
- <td><!-- div wicket:id="appointmentDescription"></div--><textarea wicket:id="appointmentDescription"></textarea></td>
+ <td><textarea wicket:id="appointmentDescription"></textarea></td>
+ </tr>
+ <tr>
+ <td><button wicket:id="enterRoom"><wicket:ommessage key="1282"/></button></td>
</tr>
</table>
</form>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1516705&r1=1516704&r2=1516705&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Fri Aug 23 05:57:47 2013
@@ -40,6 +40,7 @@ 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.user.rooms.RoomEnterBehavior;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -84,7 +85,7 @@ public class AppointmentDialog extends A
protected final FeedbackPanel feedback;
final MeetingMemberDialog addAttendees;
final MessageDialog confirmDelete;
-
+ private WebMarkupContainer enterRoom;
@Override
public int getWidth() {
return 650;
@@ -97,8 +98,21 @@ public class AppointmentDialog extends A
log.debug(" -- setModelObjectWithAjaxTarget -- Current model " + object);
if (object.getAppointmentId() != null) {
delete.setVisible(true, target);
+ if (null != object.getRoom()) {
+ enterRoom.add(new RoomEnterBehavior(object.getRoom().getRooms_id()) {
+ private static final long serialVersionUID = 3988702711022099320L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ super.onEvent(target);
+ AppointmentDialog.this.close(target, null);
+ }
+ });
+ }
+ enterRoom.setVisible(true);
} else {
delete.setVisible(false, target);
+ enterRoom.setVisible(false);
}
super.setModelObject(object);
}
@@ -293,7 +307,8 @@ public class AppointmentDialog extends A
}
});
add(attendeeContainer.setOutputMarkupId(true));
-
+ enterRoom = new WebMarkupContainer("enterRoom");
+ add(enterRoom.setOutputMarkupId(true));
}
private boolean isPwdProtected() {