diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-30 10:56:36 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-30 10:56:36 +0300 |
| commit | 38d953864af7e88eb0ee74324d9deaa0a0210993 (patch) | |
| tree | 330ec72dcbe12d56a6b6be910d88f8f771efad8a /app/views/shared | |
| parent | a60020e4886834413712cf79c653f9e979299ef5 (diff) | |
| parent | 1717fca897a16d0f4422b49d87a24d53aac034f0 (diff) | |
Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' into 'master'
Assignee dropdown does not display selected assignee
Closes #2472
See merge request !11744
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_sidebar_assignees.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/form/_metadata_issue_assignee.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml index 26567c08eb6..bcfa1dc826e 100644 --- a/app/views/shared/issuable/_sidebar_assignees.html.haml +++ b/app/views/shared/issuable/_sidebar_assignees.html.haml @@ -32,7 +32,7 @@ .selectbox.hide-collapsed - issuable.assignees.each do |assignee| - = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", assignee.id, id: nil + = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", assignee.id, id: nil, data: { avatar_url: assignee.avatar_url, name: assignee.name, username: assignee.username } - options = { toggle_class: 'js-user-search js-author-search', title: 'Assign to', filter: true, dropdown_class: 'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author', placeholder: 'Search users', data: { first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), author_id: issuable.author_id, field_name: "#{issuable.to_ability_name}[assignee_ids][]", issue_update: issuable_json_path(issuable), ability_name: issuable.to_ability_name, null_user: true } } diff --git a/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml b/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml index 8119f19291b..77175c839a6 100644 --- a/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml +++ b/app/views/shared/issuable/form/_metadata_issue_assignee.html.haml @@ -2,7 +2,7 @@ .col-sm-10{ class: ("col-lg-8" if has_due_date) } .issuable-form-select-holder.selectbox - issuable.assignees.each do |assignee| - = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", assignee.id, id: nil, data: { meta: assignee.name } + = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", assignee.id, id: nil, data: { meta: assignee.name, avatar_url: assignee.avatar_url, name: assignee.name, username: assignee.username } - if issuable.assignees.length === 0 = hidden_field_tag "#{issuable.to_ability_name}[assignee_ids][]", 0, id: nil, data: { meta: '' } |