frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Flip logic for opt-in to projects

This commit is contained in:
Nick O'Leary 2018-01-22 23:14:38 +00:00
parent dfebc4b78d
commit cf40497e6e
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
red/runtime/locales/en-US/runtime.json
View File

@ -145,6 +145,7 @@
"active-project": "Active project : __project__", "active-project": "Active project : __project__",
"no-active-project": "No active project : using default flows file", "no-active-project": "No active project : using default flows file",
"disabled": "Projects disabled : editorTheme.projects.enabled=false", "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-not-found": "Projects disabled : git command not found",
"git-version-old": "Projects disabled : git __version__ too old" "git-version-old": "Projects disabled : git __version__ too old"
} }

4
red/runtime/storage/index.js
View File

@ -55,9 +55,9 @@ var storageModuleInterface = {
return when.reject(e); return when.reject(e);
} }
if (!!storageModule.projects) { if (!!storageModule.projects) {
var projectsEnabled = true; var projectsEnabled = false;
if (runtime.settings.hasOwnProperty("editorTheme") && runtime.settings.editorTheme.hasOwnProperty("projects")) { 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) { if (projectsEnabled) {
storageModuleInterface.projects = storageModule.projects; storageModuleInterface.projects = storageModule.projects;

11
red/runtime/storage/localfilesystem/projects/index.js
View File

@ -31,7 +31,7 @@ var settings;
var runtime; var runtime;
var log; var log;
var projectsEnabled = true; var projectsEnabled = false;
var projectLogMessages = []; var projectLogMessages = [];
var projectsDir; var projectsDir;
@ -43,12 +43,15 @@ function init(_settings, _runtime) {
log = runtime.log; log = runtime.log;
try { 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")) projectLogMessages.push(log._("storage.localfilesystem.projects.disabled"))
projectsEnabled = false;
} }
} catch(err) { } catch(err) {
projectsEnabled = true; projectLogMessages.push(log._("storage.localfilesystem.projects.disabledNoFlag"))
projectsEnabled = false;
} }
if (settings.flowFile) { if (settings.flowFile) {