diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-14 22:03:20 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-14 22:03:20 +0000 |
| commit | e1e79e7e17f0ff7c6f1fa1c69c840a252af7596f (patch) | |
| tree | 28c62b8fde7735f0b11d021010ab9c290290bf6a | |
| parent | 449e1d4f04c66240e0d9ab9335633419ee1c4517 (diff) | |
| parent | cef1f4f2d9bad1f246a3d34d454f7fc419988aa9 (diff) | |
| download | gitlab-ce-e1e79e7e17f0ff7c6f1fa1c69c840a252af7596f.tar.gz | |
Merge branch 'zero-dropdown-id' into 'master'
Fixes issue with unassigned not working in dropdown
Also allowed issues to be bulk unassigned
See merge request !3211
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index b94de4c7b5e..4f038477755 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -251,7 +251,7 @@ class GitLabDropdown # Toggle active class for the tick mark el.toggleClass "is-active" - if value + if value? if !field.length # Create hidden input for form input = "<input type='hidden' name='#{fieldName}' />" diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index 4df96a06dbe..42a3c2c3f02 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -94,7 +94,7 @@ %a{href: "#", data: {id: "close"}} Closed .filter-item.inline = dropdown_tag("Assignee", options: { toggle_class: "js-user-search", title: "Assign to", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable", - placeholder: "Search authors", data: { first_user: (current_user.username if current_user), current_user: true, project_id: @project.id, field_name: "update[assignee_id]" } }) + placeholder: "Search authors", data: { first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: @project.id, field_name: "update[assignee_id]" } }) .filter-item.inline = dropdown_tag("Milestone", options: { title: "Assign milestone", toggle_class: 'js-milestone-select', filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search milestones", data: { show_no: true, field_name: "update[milestone_id]", project_id: @project.id, milestones: namespace_project_milestones_path(@project.namespace, @project, :js), use_id: true } }) |