Deprecate editorTheme.palette.editable for externalModules.palette.allowInstall

Also deprecates editorTheme.palette.editable for externalModules.palette.allowUpload
This commit is contained in:
Nick O'Leary
2020-12-23 23:29:07 +00:00
parent 3151502a3f
commit fc459be531
6 changed files with 40 additions and 20 deletions

View File

@@ -335,7 +335,24 @@ function uninstallModule(module) {
return activePromise;
}
function checkPrereq() {
async function checkPrereq() {
try {
if (settings.editorTheme.palette.editable === false) {
log.info(log._("server.palette-editor.disabled"));
installerEnabled = false;
return
}
} catch(err) {}
try {
if (settings.externalModules.palette.allowInstall === false) {
log.info(log._("server.palette-editor.disabled"));
installerEnabled = false;
return
}
} catch(err) {}
if (settings.hasOwnProperty('editorTheme') &&
settings.editorTheme.hasOwnProperty('palette') &&
settings.editorTheme.palette.hasOwnProperty('editable') &&
@@ -343,7 +360,6 @@ function checkPrereq() {
) {
log.info(log._("server.palette-editor.disabled"));
installerEnabled = false;
return Promise.resolve();
} else {
return new Promise(resolve => {
child_process.execFile(npmCommand,['-v'],function(err,stdout) {