From f30300653cce7850b4f37fe144229d76907cc8cb Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 7 Mar 2016 09:51:48 +0100
Subject: [PATCH] fix members list without project

---
 app/coffee/modules/admin/memberships.coffee | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 9dbae4fe..299c3525 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -81,10 +81,12 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             @scope.projectId = project.id
             @scope.project = project
             @scope.$emit('project:loaded', project)
+
             return project
 
     loadMembers: ->
         httpFilters = @.getUrlFilters()
+
         return @rs.memberships.list(@scope.projectId, httpFilters).then (data) =>
             @scope.memberships = _.filter(data.models, (membership) ->
                                     membership.user == null or membership.is_user_active)
@@ -95,14 +97,11 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
             return data
 
     loadInitialData: ->
-        promise = @.loadProject()
-
-        @q.all([
-            @.loadMembers(),
-            @tgAuth.refresh()
-        ])
-
-        return promise
+        return @.loadProject().then () =>
+            return @q.all([
+                @.loadMembers(),
+                @tgAuth.refresh()
+            ])
 
     getUrlFilters: ->
         filters = _.pick(@location.search(), "page")