diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-13 16:16:23 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-13 16:16:23 +0200 |
| commit | 67798492bc5409b5a596fa28022e1e6cdf5985e4 (patch) | |
| tree | d1b91938675cc009198f85639a74738c01590691 | |
| parent | f0f88390c1309b0d5a8cead701477e21c2174f05 (diff) | |
| download | gitlab-ce-67798492bc5409b5a596fa28022e1e6cdf5985e4.tar.gz | |
Add placeholder support for project_users_select_tag
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/javascripts/project_users_select.js.coffee | 3 | ||||
| -rw-r--r-- | app/helpers/selects_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/issues/_issues.html.haml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/project_users_select.js.coffee b/app/assets/javascripts/project_users_select.js.coffee index fbb1293b289..59a53cb52bc 100644 --- a/app/assets/javascripts/project_users_select.js.coffee +++ b/app/assets/javascripts/project_users_select.js.coffee @@ -20,8 +20,9 @@ $ -> $('.ajax-project-users-select').each (i, select) -> project_id = $('body').data('project-id') + $(select).select2 - placeholder: "Search for a user" + placeholder: $(select).data('placeholder') || "Search for a user" multiple: $(select).hasClass('multiselect') minimumInputLength: 0 query: (query) -> diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb index 0668a164809..a1fe4488ae9 100644 --- a/app/helpers/selects_helper.rb +++ b/app/helpers/selects_helper.rb @@ -13,7 +13,8 @@ module SelectsHelper css_class << "multiselect " if opts[:multiple] css_class << (opts[:class] || '') value = opts[:selected] || '' + placeholder = opts[:placeholder] || 'Select user' - hidden_field_tag(id, value, class: css_class) + hidden_field_tag(id, value, class: css_class, 'data-placeholder' => placeholder) end end diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index 66e8efb7df0..9cedcd453fd 100644 --- a/app/views/projects/issues/_issues.html.haml +++ b/app/views/projects/issues/_issues.html.haml @@ -6,7 +6,7 @@ = form_tag bulk_update_project_issues_path(@project), method: :post do %span Update selected issues with = select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status") - = project_users_select_tag('update[assignee_id]') + = project_users_select_tag('update[assignee_id]', placeholder: 'Assignee') = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone") = hidden_field_tag 'update[issues_ids]', [] = hidden_field_tag :status, params[:status] |