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

OO-248: fix NPE if the file is too big for the HTML editor in the CP editor

parent 856c1730
No related branches found
No related tags found
No related merge requests found
......@@ -105,6 +105,7 @@ public class HTMLEditorController extends FormBasicController {
private CustomLinkTreeModel customLinkTreeModel;
private VelocityContainer metadataVC;
private boolean editable = true;
private boolean newFile = true;
private boolean editorCheckEnabled = true; // default
......@@ -147,6 +148,7 @@ public class HTMLEditorController extends FormBasicController {
setTranslator(Util.createPackageTranslator(PlainTextEditorController.class, getLocale(),getTranslator()));
getWindowControl().setError(translate("plaintext.error.tolarge", new String[]{(size / 1000) + "", (FolderConfig.getMaxEditSizeLimit()/1000)+""}));
this.body = "";
this.editable = false;
//initForm(ureq);
return;
}
......@@ -165,6 +167,7 @@ public class HTMLEditorController extends FormBasicController {
if (!lock.isSuccess()) {
vc.contextPut("locked", Boolean.TRUE);
vc.contextPut("lockOwner", lock.getOwner().getName());
this.editable = false;
return;
} else {
vc.contextPut("locked", Boolean.FALSE);
......@@ -243,6 +246,10 @@ public class HTMLEditorController extends FormBasicController {
metadataVC.contextPut("charSet", charSet);
metadataVC.contextPut("fileName", fileName);
}
public boolean isEditable() {
return editable;
}
/**
* Optional configuration option to display the save button below the HTML
......
......@@ -137,9 +137,11 @@ public class CPContentController extends BasicController {
VFSContainer pseudoContainer = new VFSRootCPContainer(virtualRootFolderName, cp, rootDir, getTranslator());
mceCtr = WysiwygFactory.createWysiwygController(ureq, getWindowControl(), pseudoContainer, filePath, false);
mceCtr.setCancelButtonEnabled(false);
mceCtr.setSaveCloseButtonEnabled(false);
mceCtr.setShowMetadataEnabled(false);
if(mceCtr.isEditable()) {
mceCtr.setCancelButtonEnabled(false);
mceCtr.setSaveCloseButtonEnabled(false);
mceCtr.setShowMetadataEnabled(false);
}
listenTo(mceCtr);
contentVC.put("content", mceCtr.getInitialComponent());
} else {
......
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