mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-24 23:48:13 -05:00
Merge pull request #3569 from morficus/issue-3549
fix most recent post stolen by the last logged in user AND only show active users in post-settings-menu drop-down
This commit is contained in:
commit
1c104c8f00
1 changed files with 12 additions and 7 deletions
|
@ -13,7 +13,13 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
|
||||||
this.addObserver('titleScratch', this, 'titleObserver');
|
this.addObserver('titleScratch', this, 'titleObserver');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
selectedAuthor: Ember.computed.oneWay('author'),
|
selectedAuthor: Ember.computed(function () {
|
||||||
|
var self = this;
|
||||||
|
return this.get('author').then(function (author) {
|
||||||
|
self.set('selectedAuthor', author);
|
||||||
|
return author;
|
||||||
|
});
|
||||||
|
}),
|
||||||
changeAuthor: function () {
|
changeAuthor: function () {
|
||||||
var author = this.get('author'),
|
var author = this.get('author'),
|
||||||
selectedAuthor = this.get('selectedAuthor'),
|
selectedAuthor = this.get('selectedAuthor'),
|
||||||
|
@ -38,15 +44,14 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
|
||||||
}.observes('selectedAuthor'),
|
}.observes('selectedAuthor'),
|
||||||
authors: function () {
|
authors: function () {
|
||||||
//Loaded asynchronously, so must use promise proxies.
|
//Loaded asynchronously, so must use promise proxies.
|
||||||
var deferred = {},
|
var deferred = {};
|
||||||
self = this;
|
|
||||||
|
|
||||||
deferred.promise = this.store.find('user').then(function (users) {
|
deferred.promise = this.store.find('user').then(function (users) {
|
||||||
return users.rejectBy('id', 'me');
|
return users.rejectBy('id', 'me');
|
||||||
}).then(function (users) {
|
}).then(function (users) {
|
||||||
self.set('selectedAuthor', users.get('firstObject'));
|
return users.filter(function (user) {
|
||||||
|
return user.get('active');
|
||||||
return users;
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
return Ember.ArrayProxy
|
return Ember.ArrayProxy
|
||||||
|
@ -249,4 +254,4 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default PostSettingsMenuController;
|
export default PostSettingsMenuController;
|
||||||
|
|
Loading…
Add table
Reference in a new issue