Commit 423dcb46eeba31461f02424c0afa1629b24f9652
1 parent
64dbcfe2
Exists in
spb-stable
and in
3 other branches
Set initial value to Issue/MR form -> assignee selectbox
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
4 additions
and
3 deletions
Show diff stats
app/views/projects/issues/_form.html.haml
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | %i.icon-user |
| 25 | 25 | Assign to |
| 26 | 26 | .col-sm-10 |
| 27 | - = project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control') | |
| 27 | + = project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id) | |
| 28 | 28 | |
| 29 | 29 | = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' |
| 30 | 30 | .form-group | ... | ... |
app/views/projects/issues/_issue_context.html.haml
| ... | ... | @@ -6,7 +6,8 @@ |
| 6 | 6 | - if can?(current_user, :modify_issue, @issue) |
| 7 | 7 | = link_to profile_path(issue.assignee) do |
| 8 | 8 | = image_tag(avatar_icon(issue.assignee.email), class: 'avatar avatar-inline s16 assignee') if issue.assignee |
| 9 | - = f.select(:assignee_id, assignee_options(@issue), { include_blank: "Assign to user (none):" }, {class: 'select2'}) | |
| 9 | + | |
| 10 | + = project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id) | |
| 10 | 11 | - elsif issue.assignee |
| 11 | 12 | = link_to_member(@project, @issue.assignee) |
| 12 | 13 | ... | ... |
app/views/projects/merge_requests/_form.html.haml
| ... | ... | @@ -50,7 +50,7 @@ |
| 50 | 50 | %i.icon-user |
| 51 | 51 | Assign to |
| 52 | 52 | .col-sm-10 |
| 53 | - = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control') | |
| 53 | + = project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id) | |
| 54 | 54 | |
| 55 | 55 | = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' |
| 56 | 56 | .form-group | ... | ... |