Author: solomax
Date: Fri Feb 7 04:46:22 2014
New Revision: 1565532
URL: http://svn.apache.org/r1565532
Log:
[OPENMEETINGS-925] room name is displayed instead of room id in recording
details
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1565532&r1=1565531&r2=1565532&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Fri Feb 7 04:46:22 2014
@@ -20,8 +20,11 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import static org.apache.openmeetings.util.OmFileHelper.isRecordingExists;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -31,6 +34,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.resource.FileResourceStream;
public class VideoInfo extends Panel {
@@ -40,6 +44,7 @@ public class VideoInfo extends Panel {
private final Button dFLV = new Button("dFLV");
private final AjaxDownload download = new AjaxDownload();
private final IModel<FlvRecording> rm = new
CompoundPropertyModel<FlvRecording>(new FlvRecording());
+ private final IModel<String> roomName = Model.of((String)null);
public VideoInfo(String id) {
this(id, null);
@@ -50,7 +55,7 @@ public class VideoInfo extends Panel {
add(container.setOutputMarkupId(true));
setDefaultModel(rm);
- container.add(new Label("fileName"), new Label("fileSize"), new
Label("recordEnd"), new Label("room_id"),
+ container.add(new Label("fileName"), new Label("fileSize"), new
Label("recordEnd"), new Label("room_id", roomName),
dFLV.setEnabled(false), dAVI.setEnabled(false));
dAVI.add(new AjaxEventBehavior("click"){
private static final long serialVersionUID = 1L;
@@ -78,6 +83,12 @@ public class VideoInfo extends Panel {
public VideoInfo update(AjaxRequestTarget target, FlvRecording r) {
rm.setObject(r == null ? new FlvRecording() : r);
+ try {
+ Room room = getBean(RoomDao.class).get(r.getRoom_id());
+ roomName.setObject(room.getName());
+ } catch (Exception e) {
+ //no-op
+ }
dAVI.setEnabled(isRecordingExists(rm.getObject().getAlternateDownload()));
dFLV.setEnabled(isRecordingExists(rm.getObject().getFileHash()));
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1565532&r1=1565531&r2=1565532&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Fri Feb 7 04:46:22 2014
@@ -20,8 +20,11 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import static org.apache.openmeetings.util.OmFileHelper.isRecordingExists;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.record.FlvRecording;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -31,6 +34,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.resource.FileResourceStream;
public class VideoInfo extends Panel {
@@ -40,6 +44,7 @@ public class VideoInfo extends Panel {
private final Button dFLV = new Button("dFLV");
private final AjaxDownload download = new AjaxDownload();
private final IModel<FlvRecording> rm = new
CompoundPropertyModel<FlvRecording>(new FlvRecording());
+ private final IModel<String> roomName = Model.of((String)null);
public VideoInfo(String id) {
this(id, null);
@@ -50,7 +55,7 @@ public class VideoInfo extends Panel {
add(container.setOutputMarkupId(true));
setDefaultModel(rm);
- container.add(new Label("fileName"), new Label("fileSize"), new
Label("recordEnd"), new Label("room_id"),
+ container.add(new Label("fileName"), new Label("fileSize"), new
Label("recordEnd"), new Label("room_id", roomName),
dFLV.setEnabled(false), dAVI.setEnabled(false));
dAVI.add(new AjaxEventBehavior("click"){
private static final long serialVersionUID = 1L;
@@ -78,6 +83,12 @@ public class VideoInfo extends Panel {
public VideoInfo update(AjaxRequestTarget target, FlvRecording r) {
rm.setObject(r == null ? new FlvRecording() : r);
+ try {
+ Room room = getBean(RoomDao.class).get(r.getRoom_id());
+ roomName.setObject(room.getName());
+ } catch (Exception e) {
+ //no-op
+ }
dAVI.setEnabled(isRecordingExists(rm.getObject().getAlternateDownload()));
dFLV.setEnabled(isRecordingExists(rm.getObject().getFileHash()));
