Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Renaming default to defaultValue as default is reserved

Browse source
This commit is contained in:
Hannah Wolfe 2013-09-14 22:39:31 +01:00
parent 9fcc0a6ed6
commit b902f8109c
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/server/data/default-settings.json
View file

@ -1,44 +1,44 @@
{ {
"core": { "core": {
"databaseVersion": { "databaseVersion": {
"default": "000" "defaultValue": "000"
} }
}, },
"blog": { "blog": {
"title": { "title": {
"default": "Ghost" "defaultValue": "Ghost"
}, },
"description": { "description": {
"default": "Just a blogging platform." "defaultValue": "Just a blogging platform."
}, },
"email": { "email": {
"default": "ghost@example.com", "defaultValue": "ghost@example.com",
"validations": { "validations": {
"notNull": true, "notNull": true,
"isEmail": true "isEmail": true
} }
}, },
"logo": { "logo": {
"default": "" "defaultValue": ""
}, },
"cover": { "cover": {
"default": "" "defaultValue": ""
}, },
"defaultLang": { "defaultLang": {
"default": "en_US", "defaultValue": "en_US",
"validations": { "validations": {
"notNull": true "notNull": true
} }
}, },
"postsPerPage": { "postsPerPage": {
"default": "6", "defaultValue": "6",
"validations": { "validations": {
"notNull": true, "notNull": true,
"isNumeric": true "isNumeric": true
} }
}, },
"forceI18n": { "forceI18n": {
"default": "true", "defaultValue": "true",
"validations": { "validations": {
"notNull": true, "notNull": true,
"isIn": ["true", "false"] "isIn": ["true", "false"]
@ -47,15 +47,15 @@
}, },
"theme": { "theme": {
"activePlugins": { "activePlugins": {
"default": "" "defaultValue": ""
}, },
"activeTheme": { "activeTheme": {
"default": "casper" "defaultValue": "casper"
} }
}, },
"plugin": { "plugin": {
"installedPlugins": { "installedPlugins": {
"default": "[]" "defaultValue": "[]"
} }
} }
} }

2
core/server/models/settings.js
View file

@ -109,7 +109,7 @@ Settings = GhostBookshelf.Model.extend({
_.each(defaultSettings, function (defaultSetting, defaultSettingKey) { _.each(defaultSettings, function (defaultSetting, defaultSettingKey) {
var isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1; var isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1;
if (isMissingFromDB) { if (isMissingFromDB) {
defaultSetting.value = defaultSetting.default; defaultSetting.value = defaultSetting.defaultValue;
insertOperations.push(Settings.forge(defaultSetting).save()); insertOperations.push(Settings.forge(defaultSetting).save());
} }
}); });