more user display changes
This commit is contained in:
parent
6d3db7636a
commit
f6c2fd9a9d
5 changed files with 8 additions and 7 deletions
|
|
@ -161,7 +161,7 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
# show a user, depending on settings
|
||||
def show_user(user=@current_user, options = {})#full: false, markup: false, unique: false)
|
||||
def show_user(user=@current_user, options = {})
|
||||
if user.nil?
|
||||
"?"
|
||||
elsif FoodsoftConfig[:use_nick]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ module TasksHelper
|
|||
|
||||
def task_assignments(task)
|
||||
task.assignments.map do |ass|
|
||||
content_tag :span, ass.user.nick, :class => (ass.accepted? ? 'accepted' : 'unaccepted')
|
||||
content_tag :span, show_user(ass.user), :class => (ass.accepted? ? 'accepted' : 'unaccepted')
|
||||
end.join(", ").html_safe
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue