Remove "none" username for "Unassigned" and "Any User" select options
This commit is contained in:
parent
f385988d16
commit
af541515fa
|
@ -32,17 +32,15 @@ class @UsersSelect
|
|||
if showNullUser
|
||||
nullUser = {
|
||||
name: 'Unassigned',
|
||||
avatar: null,
|
||||
username: 'none',
|
||||
id: 0
|
||||
}
|
||||
data.results.unshift(nullUser)
|
||||
|
||||
if showAnyUser
|
||||
name = showAnyUser
|
||||
name = 'Any User' if name == true
|
||||
anyUser = {
|
||||
name: 'Any',
|
||||
avatar: null,
|
||||
username: 'none',
|
||||
name: name,
|
||||
id: null
|
||||
}
|
||||
data.results.unshift(anyUser)
|
||||
|
@ -50,7 +48,6 @@ class @UsersSelect
|
|||
if showEmailUser && data.results.length == 0 && query.term.match(/^[^@]+@[^@]+$/)
|
||||
emailUser = {
|
||||
name: "Invite \"#{query.term}\"",
|
||||
avatar: null,
|
||||
username: query.term,
|
||||
id: query.term
|
||||
}
|
||||
|
@ -82,10 +79,10 @@ class @UsersSelect
|
|||
else
|
||||
avatar = gon.default_avatar_url
|
||||
|
||||
"<div class='user-result'>
|
||||
"<div class='user-result #{'no-username' unless user.username}'>
|
||||
<div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
|
||||
<div class='user-name'>#{user.name}</div>
|
||||
<div class='user-username'>#{user.username}</div>
|
||||
<div class='user-username'>#{user.username || ""}</div>
|
||||
</div>"
|
||||
|
||||
formatSelection: (user) ->
|
||||
|
|
|
@ -123,10 +123,16 @@
|
|||
}
|
||||
|
||||
.user-result {
|
||||
min-height: 24px;
|
||||
|
||||
.user-image {
|
||||
float: left;
|
||||
}
|
||||
.user-name {
|
||||
|
||||
&.no-username {
|
||||
.user-name {
|
||||
line-height: 24px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -44,9 +44,10 @@ module IssuesHelper
|
|||
end
|
||||
|
||||
def bulk_update_milestone_options
|
||||
options_for_select([['None (backlog)', -1]]) +
|
||||
options_from_collection_for_select(project_active_milestones, 'id',
|
||||
'title', params[:milestone_id])
|
||||
milestones = project_active_milestones.to_a
|
||||
milestones.unshift(Milestone::None)
|
||||
|
||||
options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id])
|
||||
end
|
||||
|
||||
def milestone_options(object)
|
||||
|
|
|
@ -15,12 +15,14 @@ module SelectsHelper
|
|||
|
||||
html = {
|
||||
class: css_class,
|
||||
'data-placeholder' => placeholder,
|
||||
'data-null-user' => null_user,
|
||||
'data-any-user' => any_user,
|
||||
'data-email-user' => email_user,
|
||||
'data-first-user' => first_user,
|
||||
'data-current-user' => current_user
|
||||
data: {
|
||||
placeholder: placeholder,
|
||||
null_user: null_user,
|
||||
any_user: any_user,
|
||||
email_user: email_user,
|
||||
first_user: first_user,
|
||||
current_user: current_user
|
||||
}
|
||||
}
|
||||
|
||||
unless opts[:scope] == :all
|
||||
|
|
|
@ -31,11 +31,11 @@
|
|||
.issues-other-filters
|
||||
.filter-item.inline
|
||||
= users_select_tag(:assignee_id, selected: params[:assignee_id],
|
||||
placeholder: 'Assignee', class: 'trigger-submit', any_user: true, null_user: true, first_user: true, current_user: true)
|
||||
placeholder: 'Assignee', class: 'trigger-submit', any_user: "Any Assignee", null_user: true, first_user: true, current_user: true)
|
||||
|
||||
.filter-item.inline
|
||||
= users_select_tag(:author_id, selected: params[:author_id],
|
||||
placeholder: 'Author', class: 'trigger-submit', any_user: true, first_user: true, current_user: true)
|
||||
placeholder: 'Author', class: 'trigger-submit', any_user: "Any Author", first_user: true, current_user: true)
|
||||
|
||||
.filter-item.inline.milestone-filter
|
||||
= select_tag('milestone_title', projects_milestones_options,
|
||||
|
|
Loading…
Reference in New Issue