mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-25 11:55:03 +03:00
Merge pull request #5706 from ErisDS/fix-private
Database version 004 - Good to merge
This commit is contained in:
commit
744f6221c5
@ -1,8 +1,11 @@
|
||||
import Ember from 'ember';
|
||||
import Authenticator from 'simple-auth-oauth2/authenticators/oauth2';
|
||||
|
||||
export default Authenticator.extend({
|
||||
config: Ember.inject.service(),
|
||||
makeRequest: function (url, data) {
|
||||
data.client_id = 'ghost-admin';
|
||||
data.client_id = this.get('config.clientId');
|
||||
data.client_secret = this.get('config.clientSecret');
|
||||
return this._super(url, data);
|
||||
}
|
||||
});
|
||||
|
@ -15,7 +15,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
|
||||
},
|
||||
|
||||
model: function () {
|
||||
return this.store.find('setting', {type: 'blog,theme'}).then(function (records) {
|
||||
return this.store.find('setting', {type: 'blog,theme,private'}).then(function (records) {
|
||||
return records.get('firstObject');
|
||||
});
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user