fix 416
parent
8dcb479561
commit
a2336921d3
|
@ -116,6 +116,16 @@ BacklogFiltersDirective = ($log, $location) ->
|
||||||
renderSelectedFilters(selectedFilters)
|
renderSelectedFilters(selectedFilters)
|
||||||
renderFilters(_.reject(filters, "selected"))
|
renderFilters(_.reject(filters, "selected"))
|
||||||
|
|
||||||
|
selectSubjectFilter = debounce 400, (value) ->
|
||||||
|
return if value is undefined
|
||||||
|
if value.length == 0
|
||||||
|
$ctrl.replaceFilter("subject", null)
|
||||||
|
else
|
||||||
|
$ctrl.replaceFilter("subject", value)
|
||||||
|
$ctrl.loadUserstories()
|
||||||
|
|
||||||
|
$scope.$watch("filtersSubject", selectSubjectFilter)
|
||||||
|
|
||||||
# Angular Watchers
|
# Angular Watchers
|
||||||
$scope.$on "filters:loaded", (ctx, filters) ->
|
$scope.$on "filters:loaded", (ctx, filters) ->
|
||||||
initializeSelectedFilters(filters)
|
initializeSelectedFilters(filters)
|
||||||
|
|
|
@ -80,7 +80,13 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
|
||||||
return sprints
|
return sprints
|
||||||
|
|
||||||
loadUserstories: ->
|
loadUserstories: ->
|
||||||
return @rs.userstories.listUnassigned(@scope.projectId).then (userstories) =>
|
@scope.urlFilters = @.getUrlFilters()
|
||||||
|
|
||||||
|
@scope.httpParams = {}
|
||||||
|
for name, values of @scope.urlFilters
|
||||||
|
@scope.httpParams[name] = values
|
||||||
|
|
||||||
|
return @rs.userstories.listUnassigned(@scope.projectId, @scope.httpParams).then (userstories) =>
|
||||||
@scope.userstories = userstories
|
@scope.userstories = userstories
|
||||||
|
|
||||||
@.generateFilters()
|
@.generateFilters()
|
||||||
|
@ -268,11 +274,16 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
|
||||||
return promise
|
return promise
|
||||||
|
|
||||||
getUrlFilters: ->
|
getUrlFilters: ->
|
||||||
return _.pick(@location.search(), "statuses", "tags")
|
return _.pick(@location.search(), "statuses", "tags", "subject")
|
||||||
|
|
||||||
generateFilters: ->
|
generateFilters: ->
|
||||||
|
urlfilters = @.getUrlFilters()
|
||||||
|
|
||||||
|
if urlfilters.subject
|
||||||
|
@scope.filtersSubject = urlfilters.subject
|
||||||
|
|
||||||
searchdata = {}
|
searchdata = {}
|
||||||
for name, value of @.getUrlFilters()
|
for name, value of urlfilters
|
||||||
if not searchdata[name]?
|
if not searchdata[name]?
|
||||||
searchdata[name] = {}
|
searchdata[name] = {}
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,11 @@ resourceProvider = ($repo, $http, $urls) ->
|
||||||
service.get = (projectId, usId) ->
|
service.get = (projectId, usId) ->
|
||||||
return $repo.queryOne("userstories", usId)
|
return $repo.queryOne("userstories", usId)
|
||||||
|
|
||||||
service.listUnassigned = (projectId) ->
|
service.listUnassigned = (projectId, filters) ->
|
||||||
params = {"project": projectId, "milestone": "null"}
|
params = {"project": projectId, "milestone": "null"}
|
||||||
|
|
||||||
|
params = _.extend({}, params, filters or {})
|
||||||
|
|
||||||
return $repo.queryMany("userstories", params)
|
return $repo.queryMany("userstories", params)
|
||||||
|
|
||||||
service.bulkCreate = (projectId, data) ->
|
service.bulkCreate = (projectId, data) ->
|
||||||
|
|
Loading…
Reference in New Issue