Author: vdegtyarev
Date: Fri Jan 29 04:30:50 2016
New Revision: 1727477
URL: http://svn.apache.org/viewvc?rev=1727477&view=rev
Log:
OPENMEETINGS-1320 is fixed. Whiteboard saved and restored correctly.
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/windows/saveAsWmlWindow.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1727477&r1=1727476&r2=1727477&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Fri Jan 29 04:30:50 2016
@@ -38,6 +38,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.file.LibraryPresentation;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
@@ -129,13 +130,11 @@ public class ConferenceLibrary implement
// String wmlPath = current_dir +
File.separatorChar+fileName
// +".xml";
// OwnerID == null
- Long fileExplorerId = fileDao.add(fileName, "",
0L,
+ Long fileExplorerId = fileDao.add(fileName, "",
null,
null, room_id, users_id, false,
// isFolder
- false, // isImage
- false, // isPresentation
+ Type.WmlFile,
localFileName, // WML
localFileName
- true, // isStoredWML file
- true, "", "");
+ "", "");
return fileExplorerId;
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1727477&r1=1727476&r2=1727477&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
Fri Jan 29 04:30:50 2016
@@ -46,8 +46,7 @@ public class FileExplorerItemDao {
private EntityManager em;
public Long add(String fileName, String fileHash, Long parentId, Long
ownerId, Long roomId, Long insertedBy,
- Boolean isFolder, Boolean isImage, Boolean
isPresentation, String wmlFilePath, Boolean isStoredWmlFile,
- Boolean isChart, String externalId, String
externalType) {
+ Boolean isFolder, Type type, String wmlFilePath, String
externalId, String externalType) {
log.debug(".add(): adding file " + fileName + " roomID: " +
roomId);
try {
FileExplorerItem fileItem = new FileExplorerItem();
@@ -59,23 +58,7 @@ public class FileExplorerItemDao {
fileItem.setRoomId(roomId);
fileItem.setInserted(new Date());
fileItem.setInsertedBy(insertedBy);
- Type t = null;
- if (isStoredWmlFile) {
- t = Type.WmlFile;
- }
- if (isChart) {
- t = Type.PollChart;
- }
- if (isImage) {
- t = Type.Image;
- }
- if (isPresentation) {
- t = Type.Presentation;
- }
- if (isFolder) {
- t = Type.Folder;
- }
- fileItem.setType(t);
+ fileItem.setType(type);
fileItem.setUpdated(new Date());
fileItem.setWmlFilePath(wmlFilePath);
fileItem.setExternalId(externalId);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx?rev=1727477&r1=1727476&r2=1727477&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Fri Jan 29 04:30:50 2016
@@ -118,7 +118,7 @@
<method name="prepareLoadWMLFile" args="itemObj">
if ($debug) Debug.write("loadWMLFile: ",itemObj);
- this.loadWMLFile.setAttribute('fileEId', itemObj.fileId);
+ this.loadWMLFile.setAttribute('fileId', itemObj.fileId);
if ($debug) Debug.write("prepareLoadWMLFile 1:
",parent.parent.whiteboardId);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/windows/saveAsWmlWindow.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/windows/saveAsWmlWindow.lzx?rev=1727477&r1=1727476&r2=1727477&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/windows/saveAsWmlWindow.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/windows/saveAsWmlWindow.lzx
Fri Jan 29 04:30:50 2016
@@ -39,35 +39,35 @@
<!--
<labelText x="4" y="72" labelid="561" width="200" fgcolor="0x0000FF">
<handler name="onclick">
-
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.getText(),"png");
+
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.text,"png");
this.parent.close();
</handler>
</labelText>
<labelText x="4" y="92" labelid="562" width="200" fgcolor="0x0000FF">
<handler name="onclick">
-
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.getText(),"jpg");
+
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.text,"jpg");
this.parent.close();
</handler>
</labelText>
<labelText x="4" y="112" labelid="563" width="200" fgcolor="0x0000FF">
<handler name="onclick">
-
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.getText(),"pdf");
+
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.text,"pdf");
this.parent.close();
</handler>
</labelText>
<labelText x="4" y="132" labelid="560" width="200" fgcolor="0x0000FF">
<handler name="onclick">
-
this.parent.refObj.confirmSaveAsImageExport(this.parent._savefileName1.getText());
+
this.parent.refObj.confirmSaveAsImageExport(this.parent._savefileName1.text);
this.parent.close();
</handler>
</labelText>
<labelText x="4" y="152" labelid="564" width="200" fgcolor="0x0000FF">
<handler name="onclick">
-
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.getText(),"tif");
+
this.parent.refObj.confirmSaveAsImageTypeExport(this.parent._savefileName1.text,"tif");
this.parent.close();
</handler>
</labelText>
@@ -76,7 +76,7 @@
<simpleLabelButton name="_confirm" x="40" y="190"
labelid="203" width="100" height="20">
<handler name="onclick">
-
this.parent.refObj.confirmSaveAsObject(this.parent._savefileName1.getText());
+
this.parent.refObj.confirmSaveAsObject(this.parent._savefileName1.text);
</handler>
</simpleLabelButton>
