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

Merge pull request #633 from taigaio/issue/3212/membership-pagination-issue 

fix membership pagination
stable
David Barragán Merino 2015-09-01 09:58:19 +02:00
parent 14e8429dba 5bb81c4035
commit 5aabd0dee1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
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)
@scope.page = data.current @scope.page = data.current
@scope.count = data.count @scope.count = data.count
@scope.paginatedBy = data.paginatedBy @scope.paginatedBy = data.paginatedBy
@ -110,7 +111,7 @@ module.controller("MembershipsController", MembershipsController)
## Member Avatar Directive ## Member Avatar Directive
############################################################################# #############################################################################
MembershipsDirective = ($template) -> MembershipsDirective = ($template, $compile) ->
template = $template.get("admin/admin-membership-paginator.html", true) template = $template.get("admin/admin-membership-paginator.html", true)
linkPagination = ($scope, $el, $attrs, $ctrl) -> linkPagination = ($scope, $el, $attrs, $ctrl) ->
@ -158,7 +159,11 @@ MembershipsDirective = ($template) ->
else else
pages.push({classes: "page", num: i, type: "page"}) pages.push({classes: "page", num: i, type: "page"})
$pagEl.html(template(options)) html = template(options)
html = $compile(html)($scope)
$pagEl.html(html)
$pagEl.show()
$scope.$watch "memberships", (value) -> $scope.$watch "memberships", (value) ->
# Do nothing if value is not logical true # Do nothing if value is not logical true
@ -198,7 +203,7 @@ MembershipsDirective = ($template) ->
return {link:link} return {link:link}
module.directive("tgMemberships", ["$tgTemplate", MembershipsDirective]) module.directive("tgMemberships", ["$tgTemplate", "$compile", MembershipsDirective])
############################################################################# #############################################################################
@ -400,6 +405,10 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
$confirm.askOnDelete(title, message).then (finish) -> $confirm.askOnDelete(title, message).then (finish) ->
onSuccess = -> onSuccess = ->
finish() finish()
if $scope.page > 1 && ($scope.count - 1) <= $scope.paginatedBy
$ctrl.selectFilter("page", $scope.page - 1)
$ctrl.loadMembers() $ctrl.loadMembers()
text = $translate.instant("ADMIN.MEMBERSHIP.SUCCESS_DELETE") text = $translate.instant("ADMIN.MEMBERSHIP.SUCCESS_DELETE")