diff options
| author | Felipe Artur <felipefac@gmail.com> | 2018-01-17 12:28:36 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-01-17 15:52:15 -0200 |
| commit | 4c5159d31cb9a7b9c2bf677489bed4845e5bc1fc (patch) | |
| tree | 7ddb2a470bad8fda188a8c16c54f9b2d4e8c987c | |
| parent | 5c51cbca06b099427e15309b352d01d960f641e3 (diff) | |
| download | gitlab-ce-issue_37143_2.tar.gz | |
Remove unnecessary query from labels filterissue_37143_2
| -rw-r--r-- | app/finders/labels_finder.rb | 2 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/issue_37143_2.yml | 5 |
4 files changed, 13 insertions, 2 deletions
diff --git a/app/finders/labels_finder.rb b/app/finders/labels_finder.rb index 6de9eb89468..1427cdaa382 100644 --- a/app/finders/labels_finder.rb +++ b/app/finders/labels_finder.rb @@ -71,7 +71,7 @@ class LabelsFinder < UnionFinder end def projects? - params[:project_ids].present? + params[:project_ids] end def only_group_labels? diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 2668cf78afe..923e4738ef1 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -371,4 +371,10 @@ module IssuablesHelper def parent @project || @group end + + def selected_labels + return unless params[:label_name] + + [Label.new(title: params[:label_name].first)] if params[:label_name].size == 1 + end end diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index 8442d7ff4a2..7704c88905b 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -22,7 +22,7 @@ = render "shared/issuable/milestone_dropdown", selected: finder.milestones.try(:first), name: :milestone_title, show_any: true, show_upcoming: true, show_started: true .filter-item.inline.labels-filter - = render "shared/issuable/label_dropdown", selected: finder.labels.select(:title).uniq, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" } + = render "shared/issuable/label_dropdown", selected: selected_labels, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" } - if issuable_filter_present? .filter-item.inline.reset-filters diff --git a/changelogs/unreleased/issue_37143_2.yml b/changelogs/unreleased/issue_37143_2.yml new file mode 100644 index 00000000000..38125f666b2 --- /dev/null +++ b/changelogs/unreleased/issue_37143_2.yml @@ -0,0 +1,5 @@ +--- +title: Remove unecessary query from labels filter +merge_request: +author: +type: performance |