Revision: 3962
Author: seba.wagner
Date: Tue Jul 5 06:16:51 2011
Log: Restructure some files
http://code.google.com/p/openmeetings/source/detail?r=3962
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/fileExplorer.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
Thu Nov 4 06:22:58 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
Tue Jul 5 06:16:51 2011
@@ -57,7 +57,7 @@
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
<netparam><method name="getValue">return
hib.currentdomainObj.organisation_id;</method></netparam>
<handler name="ondata" args="value">
- if ($debug) Debug.write("getFileExplorerByRoom: ",value);
+ if ($debug) Debug.write("getFLVExplorerByRoom: ",value);
parent.parseRootItems(value);
</handler>
</netRemoteCallHib>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/fileExplorer.lzx
Mon May 30 13:39:45 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/fileExplorer.lzx
Tue Jul 5 06:16:51 2011
@@ -18,19 +18,17 @@
lz.Track.register(this._trashBar._trashIcon,
canvas.currentImagesListdraw.currentTrackGroupName);
</handler>
- <method name="loadFiles">
- this.getFileExplorerByRoom.doCall();
- </method>
+
<handler name="onvisible">
//This is thrown whenever an uploaded Document has completed
if (this._selected == null) {
- this.getFileExplorerByRoom.doCall();
+ this.loadFiles();
} else {
if (this._selected.isFolder) {
this._selected.refresh();
} else {
- this.getFileExplorerByRoom.doCall();
+ this.loadFiles();
}
}
</handler>
@@ -128,6 +126,10 @@
canvas._drawarea.playVideoSynced(itemObj.fileExplorerItemId,itemObj.fileName);
</method>
+ <method name="loadFiles">
+ this.getFileExplorerByRoom.doCall();
+ </method>
+
<!--
public FileExplorerObject getFileExplorerByRoom(String SID, Long
room_id)
-->
@@ -371,7 +373,7 @@
resourceN="file_explorer_reload_rsc" >
<handler name="onclick">
if ($debug) Debug.write("Refresh Folder");
- parent.parent.getFileExplorerByRoom.doCall();
+ parent.parent.loadFiles();
</handler>
</baseChooseIconView>
<view bgcolor="$once{ canvas.basebgcolorizer }" height="20"
width="1" />
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
Fri Jun 24 08:51:46 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
Tue Jul 5 06:16:51 2011
@@ -301,7 +301,7 @@
<netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
<netparam><method name="getValue">return
parent.parent.isOwner;</method></netparam>
<handler name="ondata" args="value">
- if ($debug) Debug.write("getFileExplorerByRoom: ",value);
+ if ($debug) Debug.write("getFileExplorerByParent: ",value);
parent.renderFilesAndFolders(value);
</handler>
</netRemoteCallHib>
=======================================
---
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Tue Jul 5 02:59:20 2011
+++
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Tue Jul 5 06:16:51 2011
@@ -524,10 +524,71 @@
}
} catch (Exception e) {
- log.error("[getListOfFilesByAbsolutePath]", e);
+ log.error("[getFileExplorerByRoom]", e);
return null;
}
}
+
+ public FileExplorerObject getFileExplorerByRoomSelf(String SID, Long
room_id) throws AxisFault {
+
+ try {
+
+ Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
+ Long user_level = Usermanagement.getInstance().getUserLevelByID(
+ users_id);
+
+ if (AuthLevelmanagement.getInstance().checkUserLevel(user_level))
{
+
+ log.debug("room_id " + room_id);
+
+ FileExplorerObject fileExplorerObject = new
FileExplorerObject();
+
+ // Home File List
+ FileExplorerItem[] fList = FileExplorerItemDaoImpl
+ .getInstance()
+ .getFileExplorerItemsByOwner(users_id, 0L);
+
+ long homeFileSize = 0;
+
+ for (FileExplorerItem homeChildExplorerItem : fList) {
+ log.debug("FileExplorerItem fList "
+ + homeChildExplorerItem.getFileName());
+ homeFileSize += FileUtils.getInstance()
+ .getSizeOfDirectoryAndSubs(homeChildExplorerItem);
+ }
+
+ fileExplorerObject.setUserHome(fList);
+ fileExplorerObject.setUserHomeSize(homeFileSize);
+
+ // Public File List
+ FileExplorerItem[] rList = FileExplorerItemDaoImpl
+ .getInstance().getFileExplorerItemsByRoom(room_id,
0L);
+
+ long roomFileSize = 0;
+
+ for (FileExplorerItem homeChildExplorerItem : rList) {
+ log.debug("FileExplorerItem rList "
+ + homeChildExplorerItem.getFileName());
+ roomFileSize += FileUtils.getInstance()
+ .getSizeOfDirectoryAndSubs(homeChildExplorerItem);
+ }
+
+ fileExplorerObject.setRoomHome(rList);
+ fileExplorerObject.setRoomHomeSize(roomFileSize);
+
+ return fileExplorerObject;
+
+ } else {
+
+ throw new Exception("not Authenticated");
+
+ }
+
+ } catch (Exception e) {
+ log.error("[getFileExplorerByRoomSelf]", e);
+ return null;
+ }
+ }
public FileExplorerItem[] getFileExplorerByParent(String SID,
Long parentFileExplorerItemId, Long room_id, Boolean isOwner,
Long owner_id) throws AxisFault {
@@ -563,6 +624,43 @@
} catch (Exception err) {
log.error("[getFileExplorerByParent] ", err);
}
+ return null;
+ }
+
+ public FileExplorerItem[] getFileExplorerByParentSelf(String SID,
+ Long parentFileExplorerItemId, Long room_id, Boolean isOwner)
throws AxisFault {
+
+ try {
+
+ Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
+ Long user_level = Usermanagement.getInstance().getUserLevelByID(
+ users_id);
+
+ if (AuthLevelmanagement.getInstance().checkUserLevel(user_level))
{
+
+ log.debug("parentFileExplorerItemId "
+ + parentFileExplorerItemId);
+
+ if (parentFileExplorerItemId == 0) {
+ if (isOwner) {
+ return FileExplorerItemDaoImpl.getInstance()
+ .getFileExplorerItemsByOwner(users_id,
+ parentFileExplorerItemId);
+ } else {
+ return FileExplorerItemDaoImpl.getInstance()
+ .getFileExplorerItemsByRoom(room_id,
+ parentFileExplorerItemId);
+ }
+ } else {
+ return FileExplorerItemDaoImpl.getInstance()
+ .getFileExplorerItemsByParent(
+ parentFileExplorerItemId);
+ }
+
+ }
+ } catch (Exception err) {
+ log.error("[getFileExplorerByParentSelf] ", err);
+ }
return null;
}
@@ -586,6 +684,38 @@
} catch (Exception err) {
log.error("[updateFileOrFolderName] ", err);
}
+ return null;
+ }
+
+ public Long updateFileOrFolderNameSelf(String SID, Long
fileExplorerItemId,
+ String fileName) throws AxisFault {
+
+ try {
+
+ Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
+ Long user_level = Usermanagement.getInstance().getUserLevelByID(
+ users_id);
+
+ if (AuthLevelmanagement.getInstance().checkUserLevel(user_level))
{
+
+ //TODO: check if this user is allowed to change this
file
+ /*
+ FileExplorerItem fileExItem =
FileExplorerItemDaoImpl.getInstance().getFileExplorerItemsById(fileExplorerItemId);
+
+ if (fileExItem.getOwnerId() != null
&& !fileExItem.getOwnerId().equals(users_id)) {
+ throw new Exception("This user is not the owner of the file and
not allowed to edit its name");
+ }
+ */
+
+ log.debug("deleteFileOrFolder " + fileExplorerItemId);
+
+
FileExplorerItemDaoImpl.getInstance().updateFileOrFolderName(
+ fileExplorerItemId, fileName);
+
+ }
+ } catch (Exception err) {
+ log.error("[updateFileOrFolderNameSelf] ", err);
+ }
return null;
}
@@ -616,6 +746,47 @@
FileUtils.getInstance().setFileToOwnerOrRoomByParent(fileExplorerItem,
owner_id, null);
+ } else {
+ // set this file and all subfiles and folders the
room_id
+
FileUtils.getInstance().setFileToOwnerOrRoomByParent(fileExplorerItem, null,
+ room_id);
+
+ }
+
+ }
+ } catch (Exception err) {
+ log.error("[moveFile] ", err);
+ }
+ return null;
+ }
+
+ public Long moveFileSelf(String SID, Long fileExplorerItemId,
+ Long newParentFileExplorerItemId, Long room_id, Boolean
isOwner,
+ Boolean moveToHome) throws AxisFault {
+
+ try {
+
+ Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
+ Long user_level = Usermanagement.getInstance().getUserLevelByID(
+ users_id);
+
+ if
(AuthLevelmanagement.getInstance().checkWebServiceLevel(user_level)) {
+
+ log.debug("deleteFileOrFolder " + fileExplorerItemId);
+
+ FileExplorerItemDaoImpl.getInstance().moveFile(
+ fileExplorerItemId, newParentFileExplorerItemId,
+ room_id, isOwner, users_id);
+
+ FileExplorerItem fileExplorerItem = FileExplorerItemDaoImpl
+ .getInstance().getFileExplorerItemsById(
+ fileExplorerItemId);
+
+ if (moveToHome) {
+ // set this file and all subfiles and folders the
ownerId
+
FileUtils.getInstance().setFileToOwnerOrRoomByParent(fileExplorerItem,
+ users_id, null);
+
} else {
// set this file and all subfiles and folders the
room_id
FileUtils.getInstance().setFileToOwnerOrRoomByParent(fileExplorerItem, null,
--
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.
