mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-04-15 03:01:37 -05:00
🐛 Honour labs defaults on import (#8667)
closes #8601 - This makes sure that when you do an import, you still get the LATEST default settings for labs. Even if you had a different value before. - LTS -> 1.0 is an upgrade, and Public API should be on by default, even if you had deliberately turned it off before. - Cheeky test added
This commit is contained in:
parent
c49e840fc6
commit
6a45ca2605
2 changed files with 13 additions and 1 deletions
|
@ -4,7 +4,9 @@ const debug = require('ghost-ignition').debug('importer:settings'),
|
|||
Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
BaseImporter = require('./base'),
|
||||
models = require('../../../../models');
|
||||
models = require('../../../../models'),
|
||||
defaultSettings = require('../../../schema/default-settings.json'),
|
||||
labsDefaults = JSON.parse(defaultSettings.blog.labs.defaultValue);
|
||||
|
||||
class SettingsImporter extends BaseImporter {
|
||||
constructor(options) {
|
||||
|
@ -31,6 +33,7 @@ class SettingsImporter extends BaseImporter {
|
|||
/**
|
||||
* - 'core' and 'theme' are blacklisted
|
||||
* - clean up legacy plugin setting references
|
||||
* - handle labs setting
|
||||
*/
|
||||
beforeImport() {
|
||||
debug('beforeImport');
|
||||
|
@ -54,6 +57,12 @@ class SettingsImporter extends BaseImporter {
|
|||
|
||||
_.each(this.dataToImport, function (obj) {
|
||||
obj.key = self.legacySettingsKeyValues[obj.key] || obj.key;
|
||||
|
||||
if (obj.key === 'labs' && obj.value) {
|
||||
// Overwrite the labs setting with our current defaults
|
||||
// Ensures things that are enabled in new versions, are turned on
|
||||
obj.value = JSON.stringify(_.assign({}, JSON.parse(obj.value), labsDefaults));
|
||||
}
|
||||
});
|
||||
|
||||
return super.beforeImport();
|
||||
|
|
|
@ -1396,6 +1396,9 @@ describe('Import (new test structure)', function () {
|
|||
settings[9].key.should.eql('default_locale');
|
||||
settings[9].value.should.eql('en');
|
||||
|
||||
settings[18].key.should.eql('labs');
|
||||
settings[18].value.should.eql('{"publicAPI":true}');
|
||||
|
||||
// Check post language is null
|
||||
should(firstPost.locale).equal(null);
|
||||
// Check user language is null
|
||||
|
|
Loading…
Add table
Reference in a new issue