Author: solomax
Date: Tue Jan 21 16:38:39 2014
New Revision: 1560077
URL: http://svn.apache.org/r1560077
Log:
[OPENMEETINGS-870] Download recordings should work as expected;
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1560077&r1=1560076&r2=1560077&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
Tue Jan 21 16:38:39 2014
@@ -179,9 +179,9 @@ public abstract class RecordingResourceR
private FlvRecording getRecording(Long id) {
FlvRecordingDao recDao = getBean(FlvRecordingDao.class);
FlvRecording r = recDao.get(id);
- if (r.getOwnerId() == null || r.getOwnerId() == 0
- || r.getParentFileExplorerItemId() == null ||
r.getParentFileExplorerItemId() == 0
- || getUserId() == r.getOwnerId()) {
+ // TODO should we process public?
+ // || r.getOwnerId() == 0 || r.getParentFileExplorerItemId() ==
null || r.getParentFileExplorerItemId() == 0
+ if (r.getOwnerId() == null || getUserId() == r.getOwnerId()) {
return r;
}
if
(getBean(OrganisationUserDao.class).isUserInOrganization(r.getOrganization_id(),
getUserId())) {
