summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-17 18:29:12 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-17 18:29:12 +0000
commit39a3ab7f3aa919fd196c284b1a35953e5e5d04ba (patch)
treefb6378790a0b6b94bf53c945514282031dd15344
parent6c37e0f61774e4f0c7dff7830055233b3ab2726b (diff)
parent721fa87dece962192db81107e04a90c12c826075 (diff)
downloadgitlab-ce-39a3ab7f3aa919fd196c284b1a35953e5e5d04ba.tar.gz
Merge branch 'assignee-dropdown-selected' into 'master'
Fixed issue with assignee dropdown not selecting correctly ## What does this MR do? Fixes an issue with assignee dropdown not selecting correctly. See merge request !4762
-rw-r--r--app/views/shared/issuable/_filter.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 380ab465bf4..094d6636c66 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -12,7 +12,7 @@
- if params[:author_id].present?
= hidden_field_tag(:author_id, params[:author_id])
= dropdown_tag(user_dropdown_label(params[:author_id], "Author"), options: { toggle_class: "js-user-search js-filter-submit js-author-search", title: "Filter by author", filter: true, dropdown_class: "dropdown-menu-user dropdown-menu-selectable dropdown-menu-author js-filter-submit",
- placeholder: "Search authors", data: { any_user: "Any Author", first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), selected: params[:author], field_name: "author_id", default_label: "Author" } })
+ placeholder: "Search authors", data: { any_user: "Any Author", first_user: (current_user.username if current_user), current_user: true, project_id: (@project.id if @project), selected: params[:author_id], field_name: "author_id", default_label: "Author" } })
.filter-item.inline
- if params[:assignee_id].present?