Revision: 4184
Author: seba.wagner
Date: Sun Sep 4 07:44:47 2011
Log: (Fixes issue 1453)
http://code.google.com/p/openmeetings/source/detail?r=4184
Modified:
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/dragItemFileExplorer.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/dynamicFileName.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/fileExplorer.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebServiceFacade.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/dragItemFileExplorer.lzx
Thu Jul 7 05:55:42 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/dragItemFileExplorer.lzx
Sun Sep 4 07:44:47 2011
@@ -173,11 +173,11 @@
if ($debug) Debug.write("moveFile HTTP 1: ");
//this.getFileExplorerByRoom.doCall();
var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/moveFileSelf?'
+
+canvas.httpRootKey+'services/FileService/moveFileSelfInternal?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId
+'&newParentFileExplorerItemId='+this.newParentFileExplorerItemId
- +'&room_id='+hib.currentroomid
+ +'&roomId='+hib.currentroomid
+'&isOwner='+this.isOwner
+'&moveToHome='+this.moveToHome;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/dynamicFileName.lzx
Thu Jul 7 05:55:42 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/dynamicFileName.lzx
Sun Sep 4 07:44:47 2011
@@ -42,11 +42,11 @@
if ($debug) Debug.write("moveFile HTTP 1: ");
//this.getFileExplorerByRoom.doCall();
var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/addFolderSelf?'
+
+canvas.httpRootKey+'services/FileService/addFolderSelfInternal?'
+'SID='+canvas.sessionId
+'&parentFileExplorerItemId='+this.parentFileExplorerItemId
+'&fileName='+this.text
- +'&room_id='+hib.currentroomid
+ +'&roomId='+hib.currentroomid
+'&isOwner='+this.isOwner;
this.addFolderSelf.setAttribute("src",downloadurl);
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/fileExplorer.lzx
Thu Jul 7 06:44:07 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/fileExplorer.lzx
Sun Sep 4 07:44:47 2011
@@ -132,12 +132,13 @@
<![CDATA[
//this.getFileExplorerByRoom.doCall();
var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/getFileExplorerByRoomSelf?'
+
+canvas.httpRootKey+'services/FileService/getFileExplorerByRoomSelfInternal?'
+'SID='+canvas.sessionId
- +'&room_id='+hib.currentroomid;
+ +'&roomId='+hib.currentroomid;
this.getFileExplorerByRoomSelf.setAttribute("src",downloadurl);
- if ($debug) Debug.write("getFileExplorerByRoomSelf
doRequest ",downloadurl);
+ if ($debug) Debug.write("getFileExplorerByRoomSelf doRequest
1 ",downloadurl);
+ if ($debug) Debug.write("getFileExplorerByRoomSelf doRequest
2 ",downloadurl.src);
this.getFileExplorerByRoomSelf.doRequest();
]]>
</method>
@@ -145,7 +146,8 @@
<dataset name="getFileExplorerByRoomSelf" type="http" >
<handler name="ondata" args="d">
<![CDATA[
- //if ($debug) Debug.write("ondata ",d);
+ if ($debug) Debug.write("ondata 1 ",this.src);
+ if ($debug) Debug.write("ondata 2 ",d);
parent.parseRootItems(parent.parseRootToRoomObject(d));
]]>
</handler>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
Thu Jul 7 06:49:02 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
Sun Sep 4 07:44:47 2011
@@ -325,10 +325,10 @@
<![CDATA[
//this.getFileExplorerByRoom.doCall();
var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/getFileExplorerByParentSelf?'
+
+canvas.httpRootKey+'services/FileService/getFileExplorerByParentSelfInternal?'
+'SID='+canvas.sessionId
+'&parentFileExplorerItemId='+this.fileExplorerItemId
- +'&room_id='+hib.currentroomid
+ +'&roomId='+hib.currentroomid
+'&isOwner='+this.isOwner;
this.getFileExplorerByParentSelf.setAttribute("src",downloadurl);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Sun Sep 4 07:44:47 2011
@@ -33,7 +33,7 @@
Boolean isPresentation, String wmlFilePath,
Boolean isStoredWmlFile, Boolean isChart,
Long externalFileId, String externalType) {
- log.debug(".add(): adding file " + fileName);
+ log.debug(".add(): adding file " + fileName+ " roomID: "+room_id);
try {
FileExplorerItem fileItem = new FileExplorerItem();
fileItem.setFileName(fileName);
@@ -78,7 +78,7 @@
return null;
}
- public List<FileExplorerItem> getFileExplorerItemsByRoomAndOwner(
+ public List<FileExplorerItem> getFileExplorerItemsByRoomAndOwner(
Long room_id, Long ownerId) {
log.debug(".getFileExplorerItemsByRoomAndOwner() started");
try {
@@ -92,6 +92,7 @@
query.setParameter("room_id",room_id);
query.setParameter("ownerId",ownerId);
+ @SuppressWarnings("unchecked")
List<FileExplorerItem> fileExplorerList =
query.getResultList();
return fileExplorerList;
@@ -103,7 +104,7 @@
public FileExplorerItem[] getFileExplorerItemsByRoom(Long room_id,
Long parentFileExplorerItemId) {
- log.debug(".getFileExplorerItemsByRoom() started");
+ log.debug("getFileExplorerItemsByRoom room_id :: "+room_id);
try {
String hql = "SELECT c FROM FileExplorerItem c " +
@@ -118,6 +119,7 @@
query.setParameter("room_id",room_id);
query.setParameter("parentFileExplorerItemId",
parentFileExplorerItemId);
+ @SuppressWarnings("unchecked")
FileExplorerItem[] fileExplorerList = (FileExplorerItem[])
query.getResultList().toArray(new FileExplorerItem[0]);
return fileExplorerList;
@@ -143,6 +145,7 @@
query.setParameter("ownerId",ownerId);
query.setParameter("parentFileExplorerItemId",
parentFileExplorerItemId);
+ @SuppressWarnings("unchecked")
FileExplorerItem[] fileExplorerList = (FileExplorerItem[])
query.getResultList().toArray(new FileExplorerItem[0]);
return fileExplorerList;
@@ -166,6 +169,7 @@
query.setParameter("deleted", "true");
query.setParameter("parentFileExplorerItemId",
parentFileExplorerItemId);
+ @SuppressWarnings("unchecked")
FileExplorerItem[] fileExplorerList = (FileExplorerItem[])
query.getResultList().toArray(new FileExplorerItem[0]);
return fileExplorerList;
@@ -234,6 +238,7 @@
Query query = em.createQuery(hql);
+ @SuppressWarnings("unchecked")
List<FileExplorerItem> fileExplorerList =
query.getResultList();
return fileExplorerList;
=======================================
---
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebServiceFacade.java
Thu Sep 1 07:41:20 2011
+++
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebServiceFacade.java
Sun Sep 4 07:44:47 2011
@@ -196,6 +196,13 @@
return this.geFileServiceProxy().addFolderSelf(SID,
parentFileExplorerItemId, fileName, room_id,
isOwner);
}
+
+ public Long addFolderSelfInternal(String SID, Long
parentFileExplorerItemId,
+ String fileName, Long roomId, Boolean isOwner) throws
AxisFault {
+ return this.geFileServiceProxy().addFolderSelf(SID,
+ parentFileExplorerItemId, fileName, roomId,
isOwner);
+ }
+
/**
*
@@ -261,6 +268,12 @@
return this.geFileServiceProxy()
.getFileExplorerByRoomSelf(SID, room_id);
}
+
+ public FileExplorerObject getFileExplorerByRoomSelfInternal(String SID,
Long roomId)
+ throws AxisFault {
+ return this.geFileServiceProxy()
+ .getFileExplorerByRoomSelf(SID, roomId);
+ }
public FileExplorerItem[] getFileExplorerByParent(String SID,
Long parentFileExplorerItemId, Long room_id, Boolean
isOwner,
@@ -275,6 +288,13 @@
return
this.geFileServiceProxy().getFileExplorerByParentSelf(SID,
parentFileExplorerItemId, room_id, isOwner);
}
+
+ public FileExplorerItem[] getFileExplorerByParentSelfInternal(String
SID,
+ Long parentFileExplorerItemId, Long roomId, Boolean
isOwner)
+ throws AxisFault {
+ return
this.geFileServiceProxy().getFileExplorerByParentSelf(SID,
+ parentFileExplorerItemId, roomId, isOwner);
+ }
public Long updateFileOrFolderName(String SID, Long fileExplorerItemId,
String fileName) throws AxisFault {
@@ -302,5 +322,14 @@
return this.geFileServiceProxy().moveFileSelf(SID,
fileExplorerItemId,
newParentFileExplorerItemId, room_id, isOwner,
moveToHome);
}
+
+ public Long moveFileSelfInternal(String SID, Long fileExplorerItemId,
+ Long newParentFileExplorerItemId, Long roomId, Boolean
isOwner,
+ Boolean moveToHome) throws AxisFault {
+ return this.geFileServiceProxy().moveFileSelf(SID,
fileExplorerItemId,
+ newParentFileExplorerItemId, roomId, isOwner,
moveToHome);
+ }
+
+
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
