diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 11:42:21 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 11:42:21 -0500 |
commit | a5290ac296ab4f3241827bf036c2c6678722d79c (patch) | |
tree | 97884318dfed8257c2ae335222ca05a2c172b507 /app | |
parent | 7b6fe0e25933243c2dd2826a592f4239c862dc9d (diff) | |
parent | 832cdd3d516698d0e6a7257b3d94292819a0436a (diff) | |
download | gitlab-ce-a5290ac296ab4f3241827bf036c2c6678722d79c.tar.gz |
Merge remote-tracking branch 'origin/master' into label-dropdown-fix
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/selects_helper.rb | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb index 4fc6de59a8b..e951a87a212 100644 --- a/app/helpers/selects_helper.rb +++ b/app/helpers/selects_helper.rb @@ -2,32 +2,29 @@ module SelectsHelper def users_select_tag(id, opts = {}) css_class = "ajax-users-select " css_class << "multiselect " if opts[:multiple] + css_class << "skip_ldap " if opts[:skip_ldap] css_class << (opts[:class] || '') value = opts[:selected] || '' - placeholder = opts[:placeholder] || 'Search for a user' - null_user = opts[:null_user] || false - any_user = opts[:any_user] || false - email_user = opts[:email_user] || false - first_user = opts[:first_user] && current_user ? current_user.username : false - current_user = opts[:current_user] || false - author_id = opts[:author_id] || '' - project = opts[:project] || @project + first_user = opts[:first_user] && current_user ? current_user.username : false html = { class: css_class, data: { - placeholder: placeholder, - null_user: null_user, - any_user: any_user, - email_user: email_user, + placeholder: opts[:placeholder] || 'Search for a user', + null_user: opts[:null_user] || false, + any_user: opts[:any_user] || false, + email_user: opts[:email_user] || false, first_user: first_user, - current_user: current_user, - author_id: author_id + current_user: opts[:current_user] || false, + "push-code-to-protected-branches" => opts[:push_code_to_protected_branches], + author_id: opts[:author_id] || '' } } unless opts[:scope] == :all + project = opts[:project] || @project + if project html['data-project-id'] = project.id elsif @group |