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

OO-3896: revert to old portfolio editor for pre.6

parent 5825c737
No related branches found
No related tags found
No related merge requests found
...@@ -77,7 +77,7 @@ import org.olat.modules.ceditor.SimpleAddPageElementHandler; ...@@ -77,7 +77,7 @@ import org.olat.modules.ceditor.SimpleAddPageElementHandler;
import org.olat.modules.ceditor.ui.AddElementInfos; import org.olat.modules.ceditor.ui.AddElementInfos;
import org.olat.modules.ceditor.ui.FullEditorSecurityCallback; import org.olat.modules.ceditor.ui.FullEditorSecurityCallback;
import org.olat.modules.ceditor.ui.PageController; import org.olat.modules.ceditor.ui.PageController;
import org.olat.modules.ceditor.ui.PageEditorV2Controller; import org.olat.modules.ceditor.ui.PageEditorController;
import org.olat.modules.ceditor.ui.ValidationMessage; import org.olat.modules.ceditor.ui.ValidationMessage;
import org.olat.modules.portfolio.Assignment; import org.olat.modules.portfolio.Assignment;
import org.olat.modules.portfolio.Binder; import org.olat.modules.portfolio.Binder;
...@@ -134,7 +134,7 @@ public class PageRunController extends BasicController implements TooledControll ...@@ -134,7 +134,7 @@ public class PageRunController extends BasicController implements TooledControll
private CloseableModalController cmc; private CloseableModalController cmc;
private PageMetadataController pageMetaCtrl; private PageMetadataController pageMetaCtrl;
private PageController pageCtrl; private PageController pageCtrl;
private PageEditorV2Controller pageEditCtrl; private PageEditorController pageEditCtrl;
private RestorePageController restorePageCtrl; private RestorePageController restorePageCtrl;
private ConfirmClosePageController confirmDonePageCtrl; private ConfirmClosePageController confirmDonePageCtrl;
private DialogBoxController confirmPublishCtrl, confirmRevisionCtrl, confirmCloseCtrl, private DialogBoxController confirmPublishCtrl, confirmRevisionCtrl, confirmCloseCtrl,
...@@ -200,7 +200,7 @@ public class PageRunController extends BasicController implements TooledControll ...@@ -200,7 +200,7 @@ public class PageRunController extends BasicController implements TooledControll
putInitialPanel(mainVC); putInitialPanel(mainVC);
if(openInEditMode) { if(openInEditMode) {
pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(), pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()), new FullEditorSecurityCallback(), new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()), new FullEditorSecurityCallback(),
getTranslator()); getTranslator());
listenTo(pageEditCtrl); listenTo(pageEditCtrl);
...@@ -651,7 +651,7 @@ public class PageRunController extends BasicController implements TooledControll ...@@ -651,7 +651,7 @@ public class PageRunController extends BasicController implements TooledControll
} else { } else {
lockEntry = coordinator.getCoordinator().getLocker().acquireLock(lockOres, getIdentity(), ""); lockEntry = coordinator.getCoordinator().getLocker().acquireLock(lockOres, getIdentity(), "");
if(lockEntry.isSuccess()) { if(lockEntry.isSuccess()) {
pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(), pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()), new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()),
new FullEditorSecurityCallback(), getTranslator()); new FullEditorSecurityCallback(), getTranslator());
listenTo(pageEditCtrl); listenTo(pageEditCtrl);
......
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