hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make settings work with nested "foo.bar" strings

Browse source
This commit is contained in:
SachaG 2017-09-18 09:09:43 +02:00
parent a1a4726b31
commit f1416ee534
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
packages/vulcan-lib/lib/modules/settings.js
View file

@ -1,29 +1,39 @@
export const getSetting = (setting, defaultValue) => {
import { Utils } from './utils.js';
export const Settings = {};
export const getSetting = (settingName, defaultValue) => {
let setting;
if (Meteor.isServer) {
// look in public, private, and root
const rootSetting = Meteor.settings && Meteor.settings[setting];
const privateSetting = Meteor.settings && Meteor.settings.private && Meteor.settings.private[setting];
const publicSetting = Meteor.settings && Meteor.settings.public && Meteor.settings.public[setting];
const rootSetting = Utils.getNestedProperty(Meteor.settings, settingName);
const privateSetting = Meteor.settings.private && Utils.getNestedProperty(Meteor.settings.private, settingName);
const publicSetting = Meteor.settings.public && Utils.getNestedProperty(Meteor.settings.public, settingName);
// if setting is an object, "collect" properties from all three places
if (typeof rootSetting === 'object' || typeof privateSetting === 'object' || typeof publicSetting === 'object') {
return {
setting = {
...defaultValue,
...rootSetting,
...privateSetting,
...publicSetting,
}
} else {
return rootSetting || privateSetting || publicSetting || defaultValue;
setting = rootSetting || privateSetting || publicSetting || defaultValue;
}
} else {
// look only in public
const publicSetting = Meteor.settings && Meteor.settings.public && Meteor.settings.public[setting];
return publicSetting || defaultValue;
const publicSetting = Meteor.settings.public && Utils.getNestedProperty(Meteor.settings.public, settingName);
setting = publicSetting || defaultValue;
}
Settings[settingName] = setting;
return setting;
}
// Settings collection is deprecated