0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00

Merge pull request #6821 from kevinansfield/fix-lost-settings

Fix loss of private settings when saving in certain circumstances
This commit is contained in:
Hannah Wolfe 2016-05-13 13:20:49 +02:00
commit e96364689a
4 changed files with 4 additions and 4 deletions

View file

@ -14,7 +14,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
}, },
model() { model() {
return this.store.query('setting', {type: 'blog,theme'}).then((records) => { return this.store.query('setting', {type: 'blog,theme,private'}).then((records) => {
return records.get('firstObject'); return records.get('firstObject');
}); });
}, },

View file

@ -15,7 +15,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
}, },
model() { model() {
return this.store.query('setting', {type: 'blog,theme'}).then((records) => { return this.store.query('setting', {type: 'blog,theme,private'}).then((records) => {
return records.get('firstObject'); return records.get('firstObject');
}); });
} }

View file

@ -17,7 +17,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
}, },
model() { model() {
return this.store.query('setting', {type: 'blog,theme'}).then((records) => { return this.store.query('setting', {type: 'blog,theme,private'}).then((records) => {
return records.get('firstObject'); return records.get('firstObject');
}); });
}, },

View file

@ -46,7 +46,7 @@ export default Service.extend({
}), }),
fetch() { fetch() {
return this.get('store').queryRecord('setting', {type: 'blog'}).then((settings) => { return this.get('store').queryRecord('setting', {type: 'blog,theme,private'}).then((settings) => {
this.set('_settings', settings); this.set('_settings', settings);
return true; return true;
}); });