Author: solomax
Date: Tue Jan 17 11:32:59 2017
New Revision: 1779173
URL: http://svn.apache.org/viewvc?rev=1779173&view=rev
Log:
[OPENMEETINGS-895] add folder is fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
Tue Jan 17 11:32:59 2017
@@ -52,7 +52,6 @@
</tr>
</table>
</div>
- <div wicket:id="addFolder"></div>
<div wicket:id="errors"></div>
</div>
</form>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Tue Jan 17 11:32:59 2017
@@ -36,7 +36,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.record.Recording;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.util.AjaxDownload;
@@ -77,17 +76,11 @@ public abstract class FileTreePanel exte
final FileItemTree tree;
final AjaxSplitButton download = new AjaxSplitButton("download", new
ArrayList<IMenuItem>());
private final Form<Void> form = new Form<Void>("form");
- private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
- private static final long serialVersionUID = 1L;
+ private final AddFolderDialog addFolder;
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- createFolder(target, getModelObject());
- }
- };
-
- public FileTreePanel(String id, Long roomId) {
+ public FileTreePanel(String id, AddFolderDialog addFolder, Long roomId)
{
super(id);
+ this.addFolder = addFolder;
OmTreeProvider tp = new OmTreeProvider(roomId);
setSelected(tp.getRoot(), null);
form.add(tree = new FileItemTree("tree", this, tp));
@@ -98,7 +91,6 @@ public abstract class FileTreePanel exte
@Override
protected void onInitialize() {
super.onInitialize();
- form.add(addFolder);
download.setDefaultModelObject(newDownloadMenuList());
Droppable<FileItem> trashToolbar = new
Droppable<FileItem>("trash-toolbar") {
private static final long serialVersionUID = 1L;
@@ -212,7 +204,7 @@ public abstract class FileTreePanel exte
protected abstract void update(AjaxRequestTarget target, FileItem f);
- protected void createFolder(AjaxRequestTarget target, String name) {
+ public void createFolder(AjaxRequestTarget target, String name) {
FileItem p = selected.getObject();
boolean isRecording = p instanceof Recording;
FileItem f = isRecording ? new Recording() : new
FileExplorerItem();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
Tue Jan 17 11:32:59 2017
@@ -26,6 +26,7 @@ import org.apache.openmeetings.db.dao.fi
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.file.FileItem;
+import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.Component;
@@ -36,8 +37,8 @@ public class RoomFilePanel extends FileT
private static final long serialVersionUID = 1L;
private final RoomPanel room;
- public RoomFilePanel(String id, RoomPanel room) {
- super(id, room.getRoom().getId());
+ public RoomFilePanel(String id, AddFolderDialog addFolder, RoomPanel
room) {
+ super(id, addFolder, room.getRoom().getId());
this.room = room;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Tue Jan 17 11:32:59 2017
@@ -35,6 +35,7 @@
<wicket:fragment wicket:id="file-panel">
<div class="file list" wicket:id="tree"></div>
</wicket:fragment>
+ <div wicket:id="addFolder"></div>
<div wicket:id="upload"></div>
<div wicket:id="confirm-kick" />
</wicket:panel>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Tue Jan 17 11:32:59 2017
@@ -35,6 +35,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.Client.Activity;
import org.apache.openmeetings.web.app.Client.Pod;
+import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.RoomPanel.Action;
@@ -94,6 +95,14 @@ public class RoomSidebar extends Panel {
item.add(new RoomClientPanel("user", item, room));
}
};
+ private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ roomFiles.createFolder(target, getModelObject());
+ }
+ };
private final AbstractDefaultAjaxBehavior roomAction = new
AbstractDefaultAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -272,9 +281,9 @@ public class RoomSidebar extends Panel {
selectedIdx = index;
}
}).setOutputMarkupId(true));
- roomFiles = new RoomFilePanel("tree", room);
+ roomFiles = new RoomFilePanel("tree", addFolder, room);
selfRights = new SelfIconsPanel("icons", room.getClient(),
room, true);
- add(upload = new UploadDialog("upload", room, roomFiles));
+ add(addFolder, upload = new UploadDialog("upload", room,
roomFiles));
add(toggleRight, toggleActivity, roomAction, avSettings);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
Tue Jan 17 11:32:59 2017
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,5 +31,6 @@
</td>
</tr>
</table>
+ <div wicket:id="addFolder"></div>
</wicket:panel>
</html>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Tue Jan 17 11:32:59 2017
@@ -26,6 +26,8 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.record.Recording;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -34,10 +36,19 @@ public class RecordingsPanel extends Use
private static final long serialVersionUID = 1L;
private final VideoPlayer video = new VideoPlayer("video");
private final VideoInfo info = new VideoInfo("info");
-
+ private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ fileTree.createFolder(target, getModelObject());
+ }
+ };
+ private final FileTreePanel fileTree;
+
public RecordingsPanel(String id) {
super(id);
- add(new FileTreePanel("tree", null) {
+ add(fileTree = new FileTreePanel("tree", addFolder, null) {
private static final long serialVersionUID = 1L;
@Override
@@ -55,6 +66,6 @@ public class RecordingsPanel extends Use
info.update(target, (Recording)f);
}
});
- add(video, info);
+ add(video, info, addFolder);
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
Tue Jan 17 11:32:59 2017
@@ -52,7 +52,6 @@
</tr>
</table>
</div>
- <div wicket:id="addFolder"></div>
<div wicket:id="errors"></div>
</div>
</form>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Tue Jan 17 11:32:59 2017
@@ -36,7 +36,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.record.Recording;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.util.AjaxDownload;
@@ -77,17 +76,11 @@ public abstract class FileTreePanel exte
final FileItemTree tree;
final AjaxSplitButton download = new AjaxSplitButton("download", new
ArrayList<IMenuItem>());
private final Form<Void> form = new Form<Void>("form");
- private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
- private static final long serialVersionUID = 1L;
+ private final AddFolderDialog addFolder;
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- createFolder(target, getModelObject());
- }
- };
-
- public FileTreePanel(String id, Long roomId) {
+ public FileTreePanel(String id, AddFolderDialog addFolder, Long roomId)
{
super(id);
+ this.addFolder = addFolder;
OmTreeProvider tp = new OmTreeProvider(roomId);
setSelected(tp.getRoot(), null);
form.add(tree = new FileItemTree("tree", this, tp));
@@ -98,7 +91,6 @@ public abstract class FileTreePanel exte
@Override
protected void onInitialize() {
super.onInitialize();
- form.add(addFolder);
download.setDefaultModelObject(newDownloadMenuList());
Droppable<FileItem> trashToolbar = new
Droppable<FileItem>("trash-toolbar") {
private static final long serialVersionUID = 1L;
@@ -212,7 +204,7 @@ public abstract class FileTreePanel exte
protected abstract void update(AjaxRequestTarget target, FileItem f);
- protected void createFolder(AjaxRequestTarget target, String name) {
+ public void createFolder(AjaxRequestTarget target, String name) {
FileItem p = selected.getObject();
boolean isRecording = p instanceof Recording;
FileItem f = isRecording ? new Recording() : new
FileExplorerItem();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
Tue Jan 17 11:32:59 2017
@@ -26,6 +26,7 @@ import org.apache.openmeetings.db.dao.fi
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.file.FileItem;
+import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.Component;
@@ -36,8 +37,8 @@ public class RoomFilePanel extends FileT
private static final long serialVersionUID = 1L;
private final RoomPanel room;
- public RoomFilePanel(String id, RoomPanel room) {
- super(id, room.getRoom().getId());
+ public RoomFilePanel(String id, AddFolderDialog addFolder, RoomPanel
room) {
+ super(id, addFolder, room.getRoom().getId());
this.room = room;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Tue Jan 17 11:32:59 2017
@@ -35,6 +35,7 @@
<wicket:fragment wicket:id="file-panel">
<div class="file list" wicket:id="tree"></div>
</wicket:fragment>
+ <div wicket:id="addFolder"></div>
<div wicket:id="upload"></div>
<div wicket:id="confirm-kick" />
</wicket:panel>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Tue Jan 17 11:32:59 2017
@@ -35,6 +35,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.Client;
import org.apache.openmeetings.web.app.Client.Activity;
import org.apache.openmeetings.web.app.Client.Pod;
+import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.RoomPanel.Action;
@@ -94,6 +95,14 @@ public class RoomSidebar extends Panel {
item.add(new RoomClientPanel("user", item, room));
}
};
+ private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ roomFiles.createFolder(target, getModelObject());
+ }
+ };
private final AbstractDefaultAjaxBehavior roomAction = new
AbstractDefaultAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -272,9 +281,9 @@ public class RoomSidebar extends Panel {
selectedIdx = index;
}
}).setOutputMarkupId(true));
- roomFiles = new RoomFilePanel("tree", room);
+ roomFiles = new RoomFilePanel("tree", addFolder, room);
selfRights = new SelfIconsPanel("icons", room.getClient(),
room, true);
- add(upload = new UploadDialog("upload", room, roomFiles));
+ add(addFolder, upload = new UploadDialog("upload", room,
roomFiles));
add(toggleRight, toggleActivity, roomAction, avSettings);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
Tue Jan 17 11:32:59 2017
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,5 +31,6 @@
</td>
</tr>
</table>
+ <div wicket:id="addFolder"></div>
</wicket:panel>
</html>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1779173&r1=1779172&r2=1779173&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Tue Jan 17 11:32:59 2017
@@ -26,6 +26,8 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.record.Recording;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.common.AddFolderDialog;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -34,10 +36,19 @@ public class RecordingsPanel extends Use
private static final long serialVersionUID = 1L;
private final VideoPlayer video = new VideoPlayer("video");
private final VideoInfo info = new VideoInfo("info");
-
+ private final AddFolderDialog addFolder = new
AddFolderDialog("addFolder", Application.getString(712)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ fileTree.createFolder(target, getModelObject());
+ }
+ };
+ private final FileTreePanel fileTree;
+
public RecordingsPanel(String id) {
super(id);
- add(new FileTreePanel("tree", null) {
+ add(fileTree = new FileTreePanel("tree", addFolder, null) {
private static final long serialVersionUID = 1L;
@Override
@@ -55,6 +66,6 @@ public class RecordingsPanel extends Use
info.update(target, (Recording)f);
}
});
- add(video, info);
+ add(video, info, addFolder);
}
}
