kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Simplify filter_labels method in IssuableBaseService 

IssuableBaseService::filter_labels() has been refactored to call
a new `label_ids_to_filter` method.
This commit is contained in:
Christian Couder 2019-08-30 21:28:19 +02:00
parent 760d4a1621
commit 582e075e9f
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/services/issuable_base_service.rb
View File

@ -76,22 +76,16 @@ class IssuableBaseService < BaseService
end end
def filter_labels def filter_labels
if params[:add_label_ids] label_ids_to_filter(:add_label_ids, :add_labels, false)
params[:add_label_ids] = labels_service.filter_labels_ids_in_param(:add_label_ids) label_ids_to_filter(:remove_label_ids, :remove_labels, true)
elsif params[:add_labels] label_ids_to_filter(:label_ids, :labels, false)
params[:add_label_ids] = labels_service.find_or_create_by_titles(:add_labels).map(&:id) end
end
if params[:remove_label_ids] def label_ids_to_filter(label_id_key, label_key, find_only)
params[:remove_label_ids] = labels_service.filter_labels_ids_in_param(:remove_label_ids) if params[label_id_key]
elsif params[:remove_labels] params[label_id_key] = labels_service.filter_labels_ids_in_param(label_id_key)
params[:remove_label_ids] = labels_service.find_or_create_by_titles(:remove_labels, find_only: true).map(&:id) elsif params[label_key]
end params[label_id_key] = labels_service.find_or_create_by_titles(label_key, find_only: find_only).map(&:id)
if params[:label_ids]
params[:label_ids] = labels_service.filter_labels_ids_in_param(:label_ids)
elsif params[:labels]
params[:label_ids] = labels_service.find_or_create_by_titles.map(&:id)
end end
end end