diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/helpers/form_helper.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/helpers/form_helper.rb')
-rw-r--r-- | app/helpers/form_helper.rb | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb index 3dde5afcb92..8a8d708b0b2 100644 --- a/app/helpers/form_helper.rb +++ b/app/helpers/form_helper.rb @@ -56,7 +56,7 @@ module FormHelper end def reviewers_dropdown_options(issuable_type) - { + dropdown_data = { toggle_class: 'js-reviewer-search js-multiselect js-save-user-data', title: 'Request review from', filter: true, @@ -69,13 +69,20 @@ module FormHelper project_id: (@target_project || @project)&.id, field_name: "#{issuable_type}[reviewer_ids][]", default_label: 'Unassigned', - 'dropdown-header': 'Reviewer(s)', + 'max-select': 1, + 'dropdown-header': 'Reviewer', multi_select: true, 'input-meta': 'name', 'always-show-selectbox': true, current_user_info: UserSerializer.new.represent(current_user) } } + + if merge_request_supports_multiple_reviewers? + dropdown_data = multiple_reviewers_dropdown_options(dropdown_data) + end + + dropdown_data end # Overwritten @@ -88,6 +95,11 @@ module FormHelper false end + # Overwritten + def merge_request_supports_multiple_reviewers? + false + end + private def multiple_assignees_dropdown_options(options) @@ -99,6 +111,16 @@ module FormHelper new_options end + + def multiple_reviewers_dropdown_options(options) + new_options = options.dup + + new_options[:title] = _('Select reviewer(s)') + new_options[:data][:'dropdown-header'] = _('Reviewer(s)') + new_options[:data].delete(:'max-select') + + new_options + end end FormHelper.prepend_if_ee('::EE::FormHelper') |