diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index 0b6765ef..b5a626b8 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -142,7 +142,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F initializeSubscription: -> routingKey1 = "changes.project.#{@scope.projectId}.userstories" @events.subscribe @scope, routingKey1, (message) => - @.loadUserstories() + @.loadAllPaginatedUserstories() @.loadSprints() routingKey2 = "changes.project.#{@scope.projectId}.milestones" @@ -257,7 +257,13 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F @.loadUserstories() - loadUserstories: (resetPagination = false)-> + loadAllPaginatedUserstories: () -> + page = @.page + + @.loadUserstories(true, @scope.userstories.length).then () => + @.page = page + + loadUserstories: (resetPagination = false, pageSize) -> @.loadingUserstories = true @.disablePagination = true @scope.httpParams = @.getUrlFilters() @@ -268,7 +274,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F @scope.httpParams.page = @.page - promise = @rs.userstories.listUnassigned(@scope.projectId, @scope.httpParams) + promise = @rs.userstories.listUnassigned(@scope.projectId, @scope.httpParams, pageSize) return promise.then (result) => userstories = result[0] diff --git a/app/coffee/modules/resources/userstories.coffee b/app/coffee/modules/resources/userstories.coffee index 5e98ca72..935f6d3a 100644 --- a/app/coffee/modules/resources/userstories.coffee +++ b/app/coffee/modules/resources/userstories.coffee @@ -47,11 +47,14 @@ resourceProvider = ($repo, $http, $urls, $storage) -> service.filtersData = (params) -> return $repo.queryOneRaw("userstories-filters", null, params) - service.listUnassigned = (projectId, filters) -> + service.listUnassigned = (projectId, filters, pageSize) -> params = {"project": projectId, "milestone": "null"} params = _.extend({}, params, filters or {}) service.storeQueryParams(projectId, params) - return $repo.queryMany("userstories", params, { + + return $repo.queryMany("userstories", _.extend(params, { + page_size: pageSize + }), { enablePagination: true }, true)