Merge branch 'backport_changes_from_ee' into 'master'
Backport select_helper from EE See merge request !3825
This commit is contained in:
commit
832cdd3d51
2 changed files with 12 additions and 15 deletions
|
@ -728,7 +728,7 @@ Metrics/ParameterLists:
|
|||
# A complexity metric geared towards measuring complexity for a human reader.
|
||||
Metrics/PerceivedComplexity:
|
||||
Enabled: true
|
||||
Max: 17
|
||||
Max: 18
|
||||
|
||||
|
||||
#################### Lint ################################
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue