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

Fixed bug #763: Now filter of us and issues filter by subject and reference

stable
Jesús Espino 2014-08-28 11:26:29 +02:00
parent d08e42fc08
commit fd395ca4ff
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/coffee/modules/backlog/filters.coffee
View File

@ -130,15 +130,15 @@ BacklogFiltersDirective = ($log, $location) ->
$ctrl.loadUserstories() $ctrl.loadUserstories()
selectSubjectFilter = debounce 400, (value) -> selectQFilter = debounce 400, (value) ->
return if value is undefined return if value is undefined
if value.length == 0 if value.length == 0
$ctrl.replaceFilter("subject", null) $ctrl.replaceFilter("q", null)
else else
$ctrl.replaceFilter("subject", value) $ctrl.replaceFilter("q", value)
$ctrl.loadUserstories() $ctrl.loadUserstories()
$scope.$watch("filtersSubject", selectSubjectFilter) $scope.$watch("filtersQ", selectQFilter)
## Angular Watchers ## Angular Watchers
$scope.$on "filters:loaded", (ctx, filters) -> $scope.$on "filters:loaded", (ctx, filters) ->

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

@ -106,7 +106,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
selectedTags = _.filter(@scope.filters.tags, "selected") selectedTags = _.filter(@scope.filters.tags, "selected")
selectedStatuses = _.filter(@scope.filters.statuses, "selected") selectedStatuses = _.filter(@scope.filters.statuses, "selected")
@scope.filtersSubject = "" @scope.filtersQ = ""
_.forEach [selectedTags, selectedStatuses], (filterGrp) => _.forEach [selectedTags, selectedStatuses], (filterGrp) =>
_.forEach filterGrp, (item) => _.forEach filterGrp, (item) =>
@ -327,13 +327,13 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
return promise return promise
getUrlFilters: -> getUrlFilters: ->
return _.pick(@location.search(), "statuses", "tags", "subject") return _.pick(@location.search(), "statuses", "tags", "q")
generateFilters: -> generateFilters: ->
urlfilters = @.getUrlFilters() urlfilters = @.getUrlFilters()
if urlfilters.subject if urlfilters.q
@scope.filtersSubject = urlfilters.subject @scope.filtersQ = urlfilters.q
searchdata = {} searchdata = {}
for name, value of urlfilters for name, value of urlfilters
@ -393,7 +393,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
@confirm.ask(title, subtitle).then => @confirm.ask(title, subtitle).then =>
# We modify the userstories in scope so the user doesn't see the removed US for a while # We modify the userstories in scope so the user doesn't see the removed US for a while
@scope.userstories = _.without(@scope.userstories, us); @scope.userstories = _.without(@scope.userstories, us)
@filterVisibleUserstories() @filterVisibleUserstories()
@.repo.remove(us).then => @.repo.remove(us).then =>
@.loadBacklog() @.loadBacklog()
@ -559,7 +559,7 @@ BacklogDirective = ($repo, $rootscope) ->
if filters.statuses || if filters.statuses ||
filters.tags || filters.tags ||
filters.subject filters.q
showHideFilter($scope, $el, $ctrl) showHideFilter($scope, $el, $ctrl)
$scope.$on "$destroy", -> $scope.$on "$destroy", ->

16
app/coffee/modules/issues/list.coffee
View File

@ -99,7 +99,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
getUrlFilters: -> getUrlFilters: ->
filters = _.pick(@location.search(), "page", "tags", "statuses", "types", filters = _.pick(@location.search(), "page", "tags", "statuses", "types",
"subject", "severities", "priorities", "q", "severities", "priorities",
"assignedTo", "createdBy", "orderBy") "assignedTo", "createdBy", "orderBy")
filters.page = 1 if not filters.page filters.page = 1 if not filters.page
return filters return filters
@ -127,7 +127,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
currentSearch = @location.search() currentSearch = @location.search()
urlfilters = @.getUrlFilters() urlfilters = @.getUrlFilters()
for filterName, filterValue of urlfilters for filterName, filterValue of urlfilters
if filterName == "page" or filterName == "orderBy" or filterName == "subject" if filterName == "page" or filterName == "orderBy" or filterName == "q"
continue continue
if filterName == "tags" if filterName == "tags"
@ -165,8 +165,8 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
deferred = @q.defer() deferred = @q.defer()
urlfilters = @.getUrlFilters() urlfilters = @.getUrlFilters()
if urlfilters.subject if urlfilters.q
@scope.filtersSubject = urlfilters.subject @scope.filtersQ = urlfilters.q
@.loadMyFilters().then (myFilters) => @.loadMyFilters().then (myFilters) =>
@scope.filters.myFilters = myFilters @scope.filters.myFilters = myFilters
@ -581,17 +581,17 @@ IssuesFiltersDirective = ($log, $location, $rs, $confirm) ->
$scope.$on "filters:loaded", (ctx, filters) -> $scope.$on "filters:loaded", (ctx, filters) ->
initializeSelectedFilters(filters) initializeSelectedFilters(filters)
selectSubjectFilter = debounce 400, (value) -> selectQFilter = debounce 400, (value) ->
return if value is undefined return if value is undefined
if value.length == 0 if value.length == 0
$ctrl.replaceFilter("subject", null) $ctrl.replaceFilter("q", null)
$ctrl.storeFilters() $ctrl.storeFilters()
else else
$ctrl.replaceFilter("subject", value) $ctrl.replaceFilter("q", value)
$ctrl.storeFilters() $ctrl.storeFilters()
$ctrl.loadIssues() $ctrl.loadIssues()
$scope.$watch("filtersSubject", selectSubjectFilter) $scope.$watch("filtersQ", selectQFilter)
# Dom Event Handlers # Dom Event Handlers
$el.on "click", ".filters-cats > ul > li > a", (event) -> $el.on "click", ".filters-cats > ul > li > a", (event) ->

2
app/partials/views/modules/backlog-filters.jade
View File

@ -5,7 +5,7 @@ section.filters
form form
fieldset fieldset
input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") input(type="text", placeholder="Search by subject or reference...", ng-model="filtersQ")
a.icon.icon-search(href="", title="search") a.icon.icon-search(href="", title="search")
div.filters-step-cat div.filters-step-cat

2
app/partials/views/modules/filters.jade
View File

@ -8,7 +8,7 @@ section.filters
form form
fieldset fieldset
input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") input(type="text", placeholder="Search by subject or reference...", ng-model="filtersQ")
a.icon.icon-search(href="", title="search") a.icon.icon-search(href="", title="search")
h2 h2
a.hidden(href="", title="cat-name") a.hidden(href="", title="cat-name")

2
app/partials/views/modules/issues-filters.jade
View File

@ -4,7 +4,7 @@ section.filters
span.title filters span.title filters
form form
fieldset fieldset
input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") input(type="text", placeholder="Search by subject or reference...", ng-model="filtersQ")
a.icon.icon-search(href="", title="search") a.icon.icon-search(href="", title="search")
div.filters-step-cat div.filters-step-cat
div.filters-applied div.filters-applied