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
This commit is contained in:
Jean-Philippe Lang
2009-11-11 10:48:54 +00:00
parent 8f40750ad7
commit c31411ec00
39 changed files with 65 additions and 5 deletions

View File

@@ -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

View File

@@ -346,7 +346,7 @@ class AnonymousUser < User
# Overrides a few properties
def logged?; false end
def admin; false end
def name; 'Anonymous' end
def name(*args); I18n.t(:label_user_anonymous) end
def mail; nil end
def time_zone; nil end
def rss_key; nil end