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

Merge pull request #1405 from alexhermida/feature/fix_us_backlog_filter 

User story data filter by milestone
stable
Alejandro 2018-02-13 10:18:04 +01:00 committed by GitHub
parent cd7ca64f5f 1ae5e8813a
commit 3b8a7f29f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/backlog/main.coffee
View File

@ -365,7 +365,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
@.initializeSubscription() @.initializeSubscription()
return @.loadBacklog() return @.loadBacklog()
.then(=> @.generateFilters()) .then(=> @.generateFilters(milestone = "null"))
.then(=> @scope.$emit("backlog:loaded")) .then(=> @scope.$emit("backlog:loaded"))
prepareBulkUpdateData: (uses, field="backlog_order") -> prepareBulkUpdateData: (uses, field="backlog_order") ->

5
app/coffee/modules/controllerMixins.coffee
View File

@ -207,7 +207,7 @@ class UsFiltersMixin
@filterRemoteStorageService.storeFilters(@scope.projectId, userFilters, @.storeCustomFiltersName).then(@.generateFilters) @filterRemoteStorageService.storeFilters(@scope.projectId, userFilters, @.storeCustomFiltersName).then(@.generateFilters)
@.generateFilters() @.generateFilters()
generateFilters: -> generateFilters: (milestone) ->
@.storeFilters(@params.pslug, @location.search(), @.storeFiltersName) @.storeFilters(@params.pslug, @location.search(), @.storeFiltersName)
urlfilters = @location.search() urlfilters = @location.search()
@ -221,6 +221,9 @@ class UsFiltersMixin
loadFilters.epic = urlfilters.epic loadFilters.epic = urlfilters.epic
loadFilters.q = urlfilters.q loadFilters.q = urlfilters.q
if milestone
loadFilters.milestone = milestone
return @q.all([ return @q.all([
@rs.userstories.filtersData(loadFilters), @rs.userstories.filtersData(loadFilters),
@filterRemoteStorageService.getFilters(@scope.projectId, @.storeCustomFiltersName) @filterRemoteStorageService.getFilters(@scope.projectId, @.storeCustomFiltersName)