TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 19:33:02 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5706 from ErisDS/fix-private

Browse Source 
Database version 004 - Good to merge
This commit is contained in:
Sebastian Gierlinger 2015-09-02 18:53:51 +02:00
commit 744f6221c5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghost/admin/app/authenticators/oauth2.js
View File

@ -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);
}
});

2
ghost/admin/app/routes/settings/general.js
View File

@ -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');
});
},