Download as
Browse Code »

Commit 423dcb46eeba31461f02424c0afa1629b24f9652

Authored by Dmitriy Zaporozhets
1 parent 64dbcfe2
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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
  Diff comments   View file @423dcb4
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 %i.icon-user 24 %i.icon-user
25 Assign to 25 Assign to
26 .col-sm-10 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 &nbsp; 28 &nbsp;
29 = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' 29 = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
30 .form-group 30 .form-group
app/views/projects/issues/_issue_context.html.haml
  Diff comments   View file @423dcb4
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 - if can?(current_user, :modify_issue, @issue) 6 - if can?(current_user, :modify_issue, @issue)
7 = link_to profile_path(issue.assignee) do 7 = link_to profile_path(issue.assignee) do
8 = image_tag(avatar_icon(issue.assignee.email), class: 'avatar avatar-inline s16 assignee') if issue.assignee 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 - elsif issue.assignee 11 - elsif issue.assignee
11 = link_to_member(@project, @issue.assignee) 12 = link_to_member(@project, @issue.assignee)
12 13
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @423dcb4
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 %i.icon-user 50 %i.icon-user
51 Assign to 51 Assign to
52 .col-sm-10 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 &nbsp; 54 &nbsp;
55 = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' 55 = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
56 .form-group 56 .form-group