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/02/17 20:21:16 UTC
svn commit: r1569089 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Author: solomax
Date: Mon Feb 17 19:21:16 2014
New Revision: 1569089
URL: http://svn.apache.org/r1569089
Log:
[OPENMEETINGS-922] Add folder works as expected
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1569089&r1=1569088&r2=1569089&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Mon Feb 17 19:21:16 2014
@@ -89,12 +89,13 @@ public class RecordingsPanel extends Use
f.setIsImage(false);
f.setIsPresentation(false);
f.setIsRecording(true);
- long parentId = rm.getObject().getFlvRecordingId();
- f.setParentFileExplorerItemId(parentId > 0 ? parentId : 0);
- f.setOwnerId(rm.getObject().getOwnerId());
- if (parentId < 0) {
- f.setOrganization_id(-parentId);
+ FlvRecording p = rm.getObject();
+ long parentId = p.getFlvRecordingId();
+ if (p.isFolder()) {
+ f.setParentFileExplorerItemId(parentId);
}
+ f.setOwnerId(p.getOwnerId());
+ f.setOrganization_id(p.getOrganization_id());
getBean(FlvRecordingDao.class).update(f);
target.add(trees); //FIXME add correct refresh
}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1569089&r1=1569088&r2=1569089&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Mon Feb 17 19:21:16 2014
@@ -89,12 +89,13 @@ public class RecordingsPanel extends Use
f.setIsImage(false);
f.setIsPresentation(false);
f.setIsRecording(true);
- long parentId = rm.getObject().getFlvRecordingId();
- f.setParentFileExplorerItemId(parentId > 0 ? parentId : 0);
- f.setOwnerId(rm.getObject().getOwnerId());
- if (parentId < 0) {
- f.setOrganization_id(-parentId);
+ FlvRecording p = rm.getObject();
+ long parentId = p.getFlvRecordingId();
+ if (p.isFolder()) {
+ f.setParentFileExplorerItemId(parentId);
}
+ f.setOwnerId(p.getOwnerId());
+ f.setOrganization_id(p.getOrganization_id());
getBean(FlvRecordingDao.class).update(f);
target.add(trees); //FIXME add correct refresh
}