From 000099c6fdc5a93fee46ac4875a5c8f5a68a0bb7 Mon Sep 17 00:00:00 2001
From: Nikola Begedin <begedinnikola@gmail.com>
Date: Wed, 22 Feb 2017 13:15:25 +0100
Subject: [PATCH] Fix issue with user dropdown not being populated sometimes

---
 app/controllers/project/tasks/index.js | 10 ++++++----
 app/routes/project/tasks/index.js      | 11 ++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/controllers/project/tasks/index.js b/app/controllers/project/tasks/index.js
index 17a548397..aaee1b5dd 100644
--- a/app/controllers/project/tasks/index.js
+++ b/app/controllers/project/tasks/index.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 
 const {
-  computed: { sort },
+  computed: { alias, sort },
   Controller,
   get,
   inject: { service },
@@ -10,12 +10,10 @@ const {
 } = Ember;
 
 export default Controller.extend({
-  sorting: ['order:asc'],
+  taskListsSorting: ['order:asc'],
 
   store: service(),
 
-  orderedTaskLists: sort('project.taskLists', 'sorting'),
-
   dragulaconfig: {
     options: {
       moves(el) {
@@ -29,6 +27,10 @@ export default Controller.extend({
     enabledEvents: ['drag', 'drop']
   },
 
+  members: alias('project.organization.organizationMembers'),
+  orderedTaskLists: sort('project.taskLists', 'taskListsSorting'),
+  project: alias('model'),
+
   actions: {
     onDrop(droppedTaskEl, listDropTargetEl, source, siblingTaskEl) {
       // Get the necessary attributes from the dropped card and drop target
diff --git a/app/routes/project/tasks/index.js b/app/routes/project/tasks/index.js
index d3b08d6d5..4b15c339b 100644
--- a/app/routes/project/tasks/index.js
+++ b/app/routes/project/tasks/index.js
@@ -3,21 +3,14 @@ import Ember from 'ember';
 const {
   get,
   inject: { service },
-  Route,
-  RSVP
+  Route
  } = Ember;
 
 export default Route.extend({
   projectTaskBoard: service(),
 
   model() {
-    let project = this.modelFor('project');
-    let members = get(project, 'organization.organizationMembers');
-    return RSVP.hash({ project, members });
-  },
-
-  setupController(controller, models) {
-    controller.setProperties(models);
+    return this.modelFor('project');
   },
 
   actions: {