Merge pull request #417 from astagi/fixcurrentfilter
Restore applied filters when there's no visible userstorystable
commit
112d20d527
|
@ -439,12 +439,16 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
|
||||||
return _.pick(@location.search(), "statuses", "tags", "q")
|
return _.pick(@location.search(), "statuses", "tags", "q")
|
||||||
|
|
||||||
generateFilters: ->
|
generateFilters: ->
|
||||||
|
urlfilters = @.getUrlFilters()
|
||||||
@scope.filters = {}
|
@scope.filters = {}
|
||||||
|
|
||||||
#tags
|
#tags
|
||||||
plainTags = _.flatten(_.filter(_.map(@scope.visibleUserstories, "tags")))
|
plainTags = _.flatten(_.filter(_.map(@scope.visibleUserstories, "tags")))
|
||||||
plainTags.sort()
|
plainTags.sort()
|
||||||
|
|
||||||
|
if plainTags.length == 0 and urlfilters["tags"]
|
||||||
|
plainTags.push(urlfilters["tags"])
|
||||||
|
|
||||||
@scope.filters.tags = _.map _.countBy(plainTags), (v, k) =>
|
@scope.filters.tags = _.map _.countBy(plainTags), (v, k) =>
|
||||||
obj = {
|
obj = {
|
||||||
id: k,
|
id: k,
|
||||||
|
@ -466,6 +470,9 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
|
||||||
if status
|
if status
|
||||||
return status
|
return status
|
||||||
|
|
||||||
|
if plainStatuses.length == 0 and urlfilters["statuses"]
|
||||||
|
plainStatuses.push(urlfilters["statuses"])
|
||||||
|
|
||||||
@scope.filters.statuses = _.map _.countBy(plainStatuses), (v, k) =>
|
@scope.filters.statuses = _.map _.countBy(plainStatuses), (v, k) =>
|
||||||
obj = {
|
obj = {
|
||||||
id: k,
|
id: k,
|
||||||
|
|
Loading…
Reference in New Issue