From cf40497e6e02296223dd89ffcfba8de77fd9cfac Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 22 Jan 2018 23:14:38 +0000 Subject: [PATCH] Flip logic for opt-in to projects --- red/runtime/locales/en-US/runtime.json | 1 + red/runtime/storage/index.js | 4 ++-- red/runtime/storage/localfilesystem/projects/index.js | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/red/runtime/locales/en-US/runtime.json b/red/runtime/locales/en-US/runtime.json index f7579d163..00d63d39b 100644 --- a/red/runtime/locales/en-US/runtime.json +++ b/red/runtime/locales/en-US/runtime.json @@ -145,6 +145,7 @@ "active-project": "Active project : __project__", "no-active-project": "No active project : using default flows file", "disabled": "Projects disabled : editorTheme.projects.enabled=false", + "disabledNoFlag": "Projects disabled : set editorTheme.projects.enabled=true to enable", "git-not-found": "Projects disabled : git command not found", "git-version-old": "Projects disabled : git __version__ too old" } diff --git a/red/runtime/storage/index.js b/red/runtime/storage/index.js index fe03da254..e0ef6d6b6 100644 --- a/red/runtime/storage/index.js +++ b/red/runtime/storage/index.js @@ -55,9 +55,9 @@ var storageModuleInterface = { return when.reject(e); } if (!!storageModule.projects) { - var projectsEnabled = true; + var projectsEnabled = false; if (runtime.settings.hasOwnProperty("editorTheme") && runtime.settings.editorTheme.hasOwnProperty("projects")) { - projectsEnabled = runtime.settings.editorTheme.projects.enabled !== false; + projectsEnabled = runtime.settings.editorTheme.projects.enabled === true; } if (projectsEnabled) { storageModuleInterface.projects = storageModule.projects; diff --git a/red/runtime/storage/localfilesystem/projects/index.js b/red/runtime/storage/localfilesystem/projects/index.js index d3df90f8f..3f0ff806b 100644 --- a/red/runtime/storage/localfilesystem/projects/index.js +++ b/red/runtime/storage/localfilesystem/projects/index.js @@ -31,7 +31,7 @@ var settings; var runtime; var log; -var projectsEnabled = true; +var projectsEnabled = false; var projectLogMessages = []; var projectsDir; @@ -43,12 +43,15 @@ function init(_settings, _runtime) { log = runtime.log; try { - if (settings.editorTheme.projects.enabled === false) { + if (settings.editorTheme.projects.enabled === true) { + projectLogMessages.push(log._("storage.localfilesystem.projects.disabled")) + projectsEnabled = true; + } else if (settings.editorTheme.projects.enabled === false) { projectLogMessages.push(log._("storage.localfilesystem.projects.disabled")) - projectsEnabled = false; } } catch(err) { - projectsEnabled = true; + projectLogMessages.push(log._("storage.localfilesystem.projects.disabledNoFlag")) + projectsEnabled = false; } if (settings.flowFile) {