From 44dd5ed28654527e054c416887646280923644fd Mon Sep 17 00:00:00 2001
From: Maurice Williams <morficus@gmail.com>
Date: Sat, 2 Aug 2014 01:21:43 -0400
Subject: [PATCH] fix most recent post stolen by the last logged in user AND
 only show active users in post-settings-menu drop-down

fixes #3549 fixes #3528
- instead of grabbing and setting the author after fetching the list of users, get the author info from the models "author" property and set it when that value returns. (3549)
- added filter to the PSM's "authors" attribute to only display active users (3528)
---
 ghost/admin/controllers/post-settings-menu.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/controllers/post-settings-menu.js b/ghost/admin/controllers/post-settings-menu.js
index 3829c6e9c4..1d1767cf8d 100644
--- a/ghost/admin/controllers/post-settings-menu.js
+++ b/ghost/admin/controllers/post-settings-menu.js
@@ -13,7 +13,13 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
             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 () {
         var author = this.get('author'),
             selectedAuthor = this.get('selectedAuthor'),
@@ -32,15 +38,14 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
     }.observes('selectedAuthor'),
     authors: function () {
         //Loaded asynchronously, so must use promise proxies.
-        var deferred = {},
-            self = this;
+        var deferred = {};
 
         deferred.promise = this.store.find('user').then(function (users) {
             return users.rejectBy('id', 'me');
         }).then(function (users) {
-            self.set('selectedAuthor', users.get('firstObject'));
-
-            return users;
+            return users.filter(function (user) {
+                return user.get('active');
+            });
         });
 
         return Ember.ArrayProxy
@@ -245,4 +250,4 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
     }
 });
 
-export default PostSettingsMenuController;
\ No newline at end of file
+export default PostSettingsMenuController;