summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/finders/labels_finder.rb14
1 files changed, 4 insertions, 10 deletions
diff --git a/app/finders/labels_finder.rb b/app/finders/labels_finder.rb
index 032172fdfa8..8a85f7a2952 100644
--- a/app/finders/labels_finder.rb
+++ b/app/finders/labels_finder.rb
@@ -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)