diff options
author | Toon Claes <toon@gitlab.com> | 2017-05-31 15:59:01 +0200 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2017-06-20 14:19:45 +0200 |
commit | 91c58ed14d13dcefd7ca2834d6157a9fa630a9af (patch) | |
tree | 9a3b714841297140c85d13dcc803479e6af63768 /app/helpers/form_helper.rb | |
parent | 458c292f41860d7ddea7803e4ba890fe04dc5dc4 (diff) | |
download | gitlab-ce-91c58ed14d13dcefd7ca2834d6157a9fa630a9af.tar.gz |
FormHelper#issue_assignees_dropdown_options never has multiple assignees
Only EE supports multiple issue assignees, so this CE code should not contain
code to have multiple assignees. EE will override the multiple issue assignees
feature by overriding this method.
Diffstat (limited to 'app/helpers/form_helper.rb')
-rw-r--r-- | app/helpers/form_helper.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb index 014fc46b130..729bc4bf329 100644 --- a/app/helpers/form_helper.rb +++ b/app/helpers/form_helper.rb @@ -16,8 +16,8 @@ module FormHelper end end - def issue_dropdown_options(issuable, has_multiple_assignees = true) - options = { + def issue_assignees_dropdown_options + { toggle_class: 'js-user-search js-assignee-search js-multiselect js-save-user-data', title: 'Select assignee', filter: true, @@ -27,8 +27,8 @@ module FormHelper first_user: current_user&.username, null_user: true, current_user: true, - project_id: issuable.project.try(:id), - field_name: "#{issuable.class.model_name.param_key}[assignee_ids][]", + project_id: @project.id, + field_name: 'issue[assignee_ids][]', default_label: 'Unassigned', 'max-select': 1, 'dropdown-header': 'Assignee', @@ -38,13 +38,5 @@ module FormHelper current_user_info: current_user.to_json(only: [:id, :name]) } } - - if has_multiple_assignees - options[:title] = 'Select assignee(s)' - options[:data][:'dropdown-header'] = 'Assignee(s)' - options[:data].delete(:'max-select') - end - - options end end |