diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-15 18:26:50 -0400 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-25 08:07:57 -0400 |
| commit | 74c7a537eda71ba8b08f56edacee56e09d5c1004 (patch) | |
| tree | b9bca6cc6df3e298bc01f54ed25f575adc15d801 | |
| parent | 9da87709c46f5b2d14dceaae8f97b38f94189b89 (diff) | |
| download | gitlab-ce-74c7a537eda71ba8b08f56edacee56e09d5c1004.tar.gz | |
Adding dropdown for users
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index 84193400890..fe4a54e07e1 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -71,6 +71,8 @@ class @UsersSelect Issues.filterResults $dropdown.closest('form') else if $dropdown.hasClass 'js-filter-submit' $dropdown.closest('form').submit() + else + console.log 'else' renderRow: (user) -> username = if user.username then "@#{user.username}" else "" avatar = if user.avatar_url then user.avatar_url else false diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 0f488614cf9..097e1cee140 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -42,7 +42,7 @@ .light None .selectbox.hide-collapsed - = users_select_tag("#{issuable.class.table_name.singularize}[assignee_id]", placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: issuable.assignee_id, project: @target_project, null_user: true, current_user: true, first_user: true) + = dropdown_tag("Select assignee", options: { toggle_class: "js-user-search js-author-search", title: "Filter by user", 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), selected: params[:author_id], field_name: "author_id" } }) .block.milestone .sidebar-collapsed-icon |