From 1ae5e8813a22c06fe2ee38e84e1058383f1a0d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Wed, 7 Feb 2018 23:47:44 +0100 Subject: [PATCH] User storey data filter by milestone --- app/coffee/modules/backlog/main.coffee | 2 +- app/coffee/modules/controllerMixins.coffee | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index 326a0b8c..1c4a3d2d 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -365,7 +365,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F @.initializeSubscription() return @.loadBacklog() - .then(=> @.generateFilters()) + .then(=> @.generateFilters(milestone = "null")) .then(=> @scope.$emit("backlog:loaded")) prepareBulkUpdateData: (uses, field="backlog_order") -> diff --git a/app/coffee/modules/controllerMixins.coffee b/app/coffee/modules/controllerMixins.coffee index b89b5f9e..69688158 100644 --- a/app/coffee/modules/controllerMixins.coffee +++ b/app/coffee/modules/controllerMixins.coffee @@ -207,7 +207,7 @@ class UsFiltersMixin @filterRemoteStorageService.storeFilters(@scope.projectId, userFilters, @.storeCustomFiltersName).then(@.generateFilters) @.generateFilters() - generateFilters: -> + generateFilters: (milestone) -> @.storeFilters(@params.pslug, @location.search(), @.storeFiltersName) urlfilters = @location.search() @@ -221,6 +221,9 @@ class UsFiltersMixin loadFilters.epic = urlfilters.epic loadFilters.q = urlfilters.q + if milestone + loadFilters.milestone = milestone + return @q.all([ @rs.userstories.filtersData(loadFilters), @filterRemoteStorageService.getFilters(@scope.projectId, @.storeCustomFiltersName)