fix members list without project

stable
Juanfran 2016-03-07 09:51:48 +01:00
parent 15d2e4cab9
commit f30300653c
1 changed files with 7 additions and 8 deletions

View File

@ -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,15 +97,12 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
return data
loadInitialData: ->
promise = @.loadProject()
@q.all([
return @.loadProject().then () =>
return @q.all([
@.loadMembers(),
@tgAuth.refresh()
])
return promise
getUrlFilters: ->
filters = _.pick(@location.search(), "page")
filters.page = 1 if not filters.page