|
|
|
@ -80,11 +80,12 @@ module ApplicationHelper
|
|
|
|
|
name = h(user.name(options[:format]))
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
if user.active? || (User.current.admin? && user.logged?)
|
|
|
|
|
link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes
|
|
|
|
|
else
|
|
|
|
|
name
|
|
|
|
|
end
|
|
|
|
|
#if user.active? || (User.current.admin? && user.logged?)
|
|
|
|
|
# link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes
|
|
|
|
|
#else
|
|
|
|
|
# name
|
|
|
|
|
#end
|
|
|
|
|
link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes
|
|
|
|
|
else
|
|
|
|
|
h(user.to_s)
|
|
|
|
|
end
|
|
|
|
|