taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/coffee/modules/admin/memberships.coffee
View File

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