From 5cf267f62112294f2dacef0b98a85de5ea71fc4c Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 25 Nov 2015 10:55:46 +0100
Subject: [PATCH] OO-1795: remove the library from the image and link picker
---
src/main/java/de/bps/course/nodes/ll/LLEditForm.java | 2 +-
.../controllers/linkchooser/LinkChooserController.java | 4 ++--
.../controllers/linkchooser/MediaChooserController.java | 4 ++--
.../olat/core/commons/modules/bc/FileCopyController.java | 2 +-
.../impl/elements/richText/RichTextConfiguration.java | 9 +++++++++
.../impl/elements/richText/RichTextElementComponent.java | 7 ++++---
.../olat/course/nodes/gta/ui/EditHTMLTaskController.java | 1 +
.../course/nodes/gta/ui/GTAAssignmentEditController.java | 1 +
.../nodes/gta/ui/GTASampleSolutionsEditController.java | 2 ++
.../course/nodes/gta/ui/SubmitDocumentsController.java | 2 ++
.../olat/modules/dialog/DialogElementsController.java | 2 +-
11 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/de/bps/course/nodes/ll/LLEditForm.java b/src/main/java/de/bps/course/nodes/ll/LLEditForm.java
index d8fc9119361..23a6bfbc383 100644
--- a/src/main/java/de/bps/course/nodes/ll/LLEditForm.java
+++ b/src/main/java/de/bps/course/nodes/ll/LLEditForm.java
@@ -195,7 +195,7 @@ public class LLEditForm extends FormBasicController {
removeAsListenerAndDispose(mediaChooserController);
VFSContainer courseContainer = courseEnv.getCourseFolderContainer();
- mediaChooserController = new MediaChooserController(ureq, getWindowControl(), courseContainer, null, null, "", null);
+ mediaChooserController = new MediaChooserController(ureq, getWindowControl(), courseContainer, null, null, "", null, true);
listenTo(mediaChooserController);
mediaDialogBox = new CloseableModalController(getWindowControl(), translate("choose"), mediaChooserController.getInitialComponent());
diff --git a/src/main/java/org/olat/core/commons/controllers/linkchooser/LinkChooserController.java b/src/main/java/org/olat/core/commons/controllers/linkchooser/LinkChooserController.java
index 163555ff388..fc074917857 100644
--- a/src/main/java/org/olat/core/commons/controllers/linkchooser/LinkChooserController.java
+++ b/src/main/java/org/olat/core/commons/controllers/linkchooser/LinkChooserController.java
@@ -71,7 +71,7 @@ public class LinkChooserController extends BasicController {
*/
public LinkChooserController(UserRequest ureq, WindowControl wControl, VFSContainer rootDir,
String uploadRelPath, String absolutPath, String[] suffixes, String fileName,
- CustomLinkTreeModel customLinkTreeModel) {
+ CustomLinkTreeModel customLinkTreeModel, boolean allowCustomMediaChooserFactory) {
super(ureq, wControl);
tabbedPaneViewVC = createVelocityContainer("linkchooser");
@@ -91,7 +91,7 @@ public class LinkChooserController extends BasicController {
// try to add custom media chooser from spring configuration.
// This one will be added as additional tab.
- if (CoreSpringFactory.containsBean(CustomMediaChooserFactory.class.getName())) {
+ if (allowCustomMediaChooserFactory && CoreSpringFactory.containsBean(CustomMediaChooserFactory.class.getName())) {
CustomMediaChooserFactory customMediaChooserFactory = (CustomMediaChooserFactory) CoreSpringFactory.getBean(CustomMediaChooserFactory.class.getName());
customMediaChooserCtr = customMediaChooserFactory.getInstance(ureq, wControl);
if (customMediaChooserCtr != null) {
diff --git a/src/main/java/org/olat/core/commons/controllers/linkchooser/MediaChooserController.java b/src/main/java/org/olat/core/commons/controllers/linkchooser/MediaChooserController.java
index 9953249ffb5..3a75162fc81 100644
--- a/src/main/java/org/olat/core/commons/controllers/linkchooser/MediaChooserController.java
+++ b/src/main/java/org/olat/core/commons/controllers/linkchooser/MediaChooserController.java
@@ -63,8 +63,8 @@ public class MediaChooserController extends LinkChooserController {
* internalLinkTreeModel is null.
*/
public MediaChooserController(UserRequest ureq, WindowControl wControl, VFSContainer rootDir, String uploadRelPath, String[] suffixes, String fileName,
- CustomLinkTreeModel customLinkTreeModel) {
- super(ureq, wControl, rootDir, uploadRelPath, null, suffixes, fileName, customLinkTreeModel);
+ CustomLinkTreeModel customLinkTreeModel, boolean allowCustomMediaFactory) {
+ super(ureq, wControl, rootDir, uploadRelPath, null, suffixes, fileName, customLinkTreeModel, allowCustomMediaFactory);
}
/**
diff --git a/src/main/java/org/olat/core/commons/modules/bc/FileCopyController.java b/src/main/java/org/olat/core/commons/modules/bc/FileCopyController.java
index 325776f5866..8cc58b77b91 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/FileCopyController.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/FileCopyController.java
@@ -87,7 +87,7 @@ public class FileCopyController extends LinkChooserController {
public FileCopyController(UserRequest ureq, WindowControl wControl, VFSContainer rootDir,
FolderComponent folderComponent) {
- super(ureq, wControl, rootDir, null, null, null, "", null);
+ super(ureq, wControl, rootDir, null, null, null, "", null, true);
this.folderComponent = folderComponent;
vfsLockManager = CoreSpringFactory.getImpl(VFSLockManager.class);
}
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
index 54793c50255..58590a328d7 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
@@ -141,6 +141,7 @@ public class RichTextConfiguration implements Disposable {
private String linkBrowserUploadRelPath;
private String linkBrowserRelativeFilePath;
private String linkBrowserAbsolutFilePath;
+ private boolean allowCustomMediaFactory = true;
private CustomLinkTreeModel linkBrowserCustomTreeModel;
// DOM ID of the flexi form element
private String domID;
@@ -296,6 +297,14 @@ public class RichTextConfiguration implements Disposable {
setTabFocusEnabled(true);
}
+ public boolean isAllowCustomMediaFactory() {
+ return allowCustomMediaFactory;
+ }
+
+ public void setAllowCustomMediaFactory(boolean allowCustomMediaFactory) {
+ this.allowCustomMediaFactory = allowCustomMediaFactory;
+ }
+
/**
* Add a function name that has to be executed after initialization. <br>
* E.g: myFunctionName, (alert('loading successfull')) <br>
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java
index e119913df7b..4ec3e72aacf 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementComponent.java
@@ -127,6 +127,7 @@ class RichTextElementComponent extends FormBaseComponentImpl {
private void createFileSelectorPopupWindow(final UserRequest ureq, final String type, final String fileName) {
// Get allowed suffixes from configuration and requested media browser type from event
final RichTextConfiguration config = element.getEditorConfiguration();
+ final boolean allowCustomMediaFactory = config.isAllowCustomMediaFactory();
final String[] suffixes;
if(type.equals(CMD_FILEBROWSER)) {
suffixes = null;
@@ -144,6 +145,7 @@ class RichTextElementComponent extends FormBaseComponentImpl {
//helper code which is used to create link chooser controller
ControllerCreator linkChooserControllerCreator = new ControllerCreator() {
+ @Override
public Controller createController(UserRequest lureq,WindowControl lwControl) {
LinkChooserController myLinkChooserController;
VFSContainer baseContainer = config.getLinkBrowserBaseContainer();
@@ -152,11 +154,10 @@ class RichTextElementComponent extends FormBaseComponentImpl {
CustomLinkTreeModel linkBrowserCustomTreeModel = config.getLinkBrowserCustomLinkTreeModel();
if (type.equals(CMD_FILEBROWSER)) {
// when in file mode we include the internal links to the selection
- //FIXME: user activity logger
- myLinkChooserController = new LinkChooserController(lureq, lwControl, baseContainer, uploadRelPath, absolutePath, suffixes, fileName, linkBrowserCustomTreeModel);
+ myLinkChooserController = new LinkChooserController(lureq, lwControl, baseContainer, uploadRelPath, absolutePath, suffixes, fileName, linkBrowserCustomTreeModel, allowCustomMediaFactory);
} else {
// in media or image mode, internal links make no sense here
- myLinkChooserController = new LinkChooserController(lureq, lwControl, baseContainer, uploadRelPath, absolutePath, suffixes, fileName, null);
+ myLinkChooserController = new LinkChooserController(lureq, lwControl, baseContainer, uploadRelPath, absolutePath, suffixes, fileName, null, allowCustomMediaFactory);
}
return new LayoutMain3ColsController(lureq, lwControl, myLinkChooserController);
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/EditHTMLTaskController.java b/src/main/java/org/olat/course/nodes/gta/ui/EditHTMLTaskController.java
index 398ff6f3273..0d9aa5b6921 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/EditHTMLTaskController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/EditHTMLTaskController.java
@@ -80,6 +80,7 @@ public class EditHTMLTaskController extends FormBasicController {
contentEditor = new HTMLEditorController(ureq, getWindowControl(), taskContainer, task.getFilename(), null, "media", true, false, false, mainForm);
contentEditor.getRichTextConfiguration().disableMedia();
+ contentEditor.getRichTextConfiguration().setAllowCustomMediaFactory(false);
listenTo(contentEditor);
FormItem editorItem = contentEditor.getInitialFormItem();
editorItem.setLabel("task.file", null);
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java
index 28c0cfc4b05..e20fcdc1f6b 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAAssignmentEditController.java
@@ -420,6 +420,7 @@ public class GTAAssignmentEditController extends FormBasicController {
newTaskEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
tasksContainer, documentName, "media", true, true);
newTaskEditorCtrl.getRichTextConfiguration().disableMedia();
+ newTaskEditorCtrl.getRichTextConfiguration().setAllowCustomMediaFactory(false);
newTaskEditorCtrl.setNewFile(true);
newTaskEditorCtrl.setUserObject(taskDef);
listenTo(newTaskEditorCtrl);
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java
index c55b0cf1387..d704bde626f 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java
@@ -278,6 +278,7 @@ public class GTASampleSolutionsEditController extends FormBasicController {
newSolutionEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
solutionContainer, documentName, "media", true, true);
newSolutionEditorCtrl.getRichTextConfiguration().disableMedia();
+ newSolutionEditorCtrl.getRichTextConfiguration().setAllowCustomMediaFactory(false);
newSolutionEditorCtrl.setNewFile(true);
newSolutionEditorCtrl.setUserObject(solution);
listenTo(newSolutionEditorCtrl);
@@ -293,6 +294,7 @@ public class GTASampleSolutionsEditController extends FormBasicController {
editSolutionEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
solutionContainer, documentName, "media", true, true);
editSolutionEditorCtrl.getRichTextConfiguration().disableMedia();
+ editSolutionEditorCtrl.getRichTextConfiguration().setAllowCustomMediaFactory(false);
listenTo(editSolutionEditorCtrl);
cmc = new CloseableModalController(getWindowControl(), "close", editSolutionEditorCtrl.getInitialComponent());
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java b/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java
index a8c9d30e677..897752f94e5 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java
@@ -426,6 +426,7 @@ class SubmitDocumentsController extends FormBasicController {
newDocumentEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
documentsContainer, documentName, "media", true, true);
newDocumentEditorCtrl.getRichTextConfiguration().disableMedia();
+ newDocumentEditorCtrl.getRichTextConfiguration().setAllowCustomMediaFactory(false);
newDocumentEditorCtrl.setNewFile(true);
listenTo(newDocumentEditorCtrl);
@@ -441,6 +442,7 @@ class SubmitDocumentsController extends FormBasicController {
editDocumentEditorCtrl = WysiwygFactory.createWysiwygController(ureq, getWindowControl(),
documentsContainer, documentName, "media", true, true);
editDocumentEditorCtrl.getRichTextConfiguration().disableMedia();
+ editDocumentEditorCtrl.getRichTextConfiguration().setAllowCustomMediaFactory(false);
listenTo(editDocumentEditorCtrl);
cmc = new CloseableModalController(getWindowControl(), "close", editDocumentEditorCtrl.getInitialComponent());
diff --git a/src/main/java/org/olat/modules/dialog/DialogElementsController.java b/src/main/java/org/olat/modules/dialog/DialogElementsController.java
index 370fc8eb013..98e9d039fd3 100644
--- a/src/main/java/org/olat/modules/dialog/DialogElementsController.java
+++ b/src/main/java/org/olat/modules/dialog/DialogElementsController.java
@@ -466,7 +466,7 @@ public class DialogElementsController extends BasicController {
private class MyLinkChooserController extends LinkChooserController {
public MyLinkChooserController(UserRequest ureq, WindowControl wControl, VFSContainer rootDir, String uploadRelPath) {
- super(ureq, wControl, rootDir, uploadRelPath, null, null, "", null);
+ super(ureq, wControl, rootDir, uploadRelPath, null, null, "", null, true);
}
@Override
--
GitLab