Improve label filtering implementation

This commit is contained in:
Stan Hu 2016-10-24 06:43:13 -07:00
parent af4d16d9b8
commit ce256c28f2
1 changed files with 4 additions and 10 deletions

View File

@ -35,13 +35,11 @@ class LabelsFinder < UnionFinder
end
def with_title(items)
# Match no labels if an empty title is supplied to avoid matching all
# labels (e.g. when an issue is moved)
return items.none if raw_title && raw_title.empty?
if title
items = items.where(title: title)
else
items.where(title: title)
elsif params[:title] || params[:name] # empty input, should match nothing
items.none
else # not filtering
items
end
end
@ -62,10 +60,6 @@ class LabelsFinder < UnionFinder
params[:title].presence || params[:name].presence
end
def raw_title
params[:title] || params[:name]
end
def project
return @project if defined?(@project)