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

Filtering memberships with owner in team members

stable
Alejandro Alonso 2014-11-26 12:11:16 +01:00 committed by Jesús Espino
parent e0694b2b76
commit b7f570ae53
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/coffee/modules/resources/memberships.coffee
View File

@ -28,11 +28,14 @@ resourceProvider = ($repo, $http, $urls) ->
service.get = (id) -> service.get = (id) ->
return $repo.queryOne("memberships", id) return $repo.queryOne("memberships", id)
service.list = (projectId, filters) -> service.list = (projectId, filters, enablePagination=true) ->
params = {project: projectId} params = {project: projectId}
params = _.extend({}, params, filters or {}) params = _.extend({}, params, filters or {})
if enablePagination
return $repo.queryPaginated("memberships", params) return $repo.queryPaginated("memberships", params)
return $repo.queryMany("memberships", params, options={enablePagination:enablePagination})
service.listByUser = (userId, filters) -> service.listByUser = (userId, filters) ->
params = {user: userId} params = {user: userId}
params = _.extend({}, params, filters or {}) params = _.extend({}, params, filters or {})

5
app/coffee/modules/team/main.coffee
View File

@ -48,6 +48,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
# On Success # On Success
promise.then => promise.then =>
#TODO: i18n
@appTitle.set("Team - " + @scope.project.name) @appTitle.set("Team - " + @scope.project.name)
tgLoader.pageLoaded() tgLoader.pageLoaded()
@ -63,8 +64,8 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
@scope.filtersRole = "" @scope.filtersRole = ""
loadMembers: -> loadMembers: ->
return @rs.memberships.list(@scope.projectId).then (data) => return @rs.memberships.list(@scope.projectId, {}, false).then (data) =>
@scope.memberships = data.models @scope.memberships = _.filter(data, (membership) => membership.user?)
return data return data
loadProject: -> loadProject: ->