Skip to content
Snippets Groups Projects
Commit 7a6a19a4 authored by srosse's avatar srosse
Browse files

OO-3896: reactivate page editor v2, ignore events in forms of editor

parent c4e2168e
No related branches found
No related tags found
No related merge requests found
......@@ -77,7 +77,7 @@ import org.olat.modules.ceditor.SimpleAddPageElementHandler;
import org.olat.modules.ceditor.ui.AddElementInfos;
import org.olat.modules.ceditor.ui.FullEditorSecurityCallback;
import org.olat.modules.ceditor.ui.PageController;
import org.olat.modules.ceditor.ui.PageEditorController;
import org.olat.modules.ceditor.ui.PageEditorV2Controller;
import org.olat.modules.ceditor.ui.ValidationMessage;
import org.olat.modules.portfolio.Assignment;
import org.olat.modules.portfolio.Binder;
......@@ -134,7 +134,7 @@ public class PageRunController extends BasicController implements TooledControll
private CloseableModalController cmc;
private PageMetadataController pageMetaCtrl;
private PageController pageCtrl;
private PageEditorController pageEditCtrl;
private PageEditorV2Controller pageEditCtrl;
private RestorePageController restorePageCtrl;
private ConfirmClosePageController confirmDonePageCtrl;
private DialogBoxController confirmPublishCtrl, confirmRevisionCtrl, confirmCloseCtrl,
......@@ -201,7 +201,7 @@ public class PageRunController extends BasicController implements TooledControll
putInitialPanel(mainVC);
if(openInEditMode) {
pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(),
new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()), new FullEditorSecurityCallback(),
getTranslator());
listenTo(pageEditCtrl);
......@@ -652,7 +652,7 @@ public class PageRunController extends BasicController implements TooledControll
} else {
lockEntry = coordinator.getCoordinator().getLocker().acquireLock(lockOres, getIdentity(), "");
if(lockEntry.isSuccess()) {
pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(),
new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()),
new FullEditorSecurityCallback(), getTranslator());
listenTo(pageEditCtrl);
......
......@@ -81,6 +81,7 @@
interact('.o_page_part.o_page_part_view, .o_page_fragment_edit').draggable({
autoScroll: true,
ignoreFrom: '.o_page_part.o_page_edit form',
allowFrom: '.o_page_tools_dd, .o_page_part.o_page_part_view',
modifiers: [
interact.modifiers.restrict({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment