Author: sebawagner
Date: Sun Apr 15 14:32:55 2012
New Revision: 1326350
URL: http://svn.apache.org/viewvc?rev=1326350&view=rev
Log:
OPENMEETINGS-172 Home drive in recorder UI, minimize the home drive makes the
list of files empty, drag and rop file from home drive to public drive
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java?rev=1326350&r1=1326349&r2=1326350&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Sun Apr 15 14:32:55 2012
@@ -248,7 +248,7 @@ public class FlvRecordingDaoImpl {
String hql = "SELECT c FROM FlvRecording c " +
"WHERE c.deleted <> :deleted " +
"AND c.ownerId = :ownerId " +
- "AND c.parentFileExplorerItemId =
:parentFileExplorerItemId " +
+ "AND (c.parentFileExplorerItemId IS
NULL OR c.parentFileExplorerItemId = :parentFileExplorerItemId)" +
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FlvRecording> query = em.createQuery(hql,
FlvRecording.class);