summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-11 10:48:54 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-11 10:48:54 +0000
commitc31411ec0029d5b2033d2d91aef18f601a8a7224 (patch)
treedbbf2414f6d85a7bb05aad58297398fd0e692c99 /app/helpers
parent8f40750ad7f7ad512fd816757f072c42fae20e66 (diff)
downloadredmine-c31411ec0029d5b2033d2d91aef18f601a8a7224.tar.gz
redmine-c31411ec0029d5b2033d2d91aef18f601a8a7224.zip
Fixes ApplicationHelper#link_to_user
* No link to a locked user page (closes #4182) * Translate Anonymous string git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3024 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bab883083..cacfe2986 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -44,12 +44,17 @@ module ApplicationHelper
link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
end
- # Display a link to user's account page
+ # Displays a link to user's account page if active
def link_to_user(user, options={})
if user.is_a?(User)
- !user.anonymous? ? link_to(user.name(options[:format]), :controller => 'users', :action => 'show', :id => user) : 'Anonymous'
+ name = h(user.name(options[:format]))
+ if user.active?
+ link_to name, :controller => 'users', :action => 'show', :id => user
+ else
+ name
+ end
else
- user.to_s
+ h(user.to_s)
end
end