@@ -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 app/helpers/application_helper.rb @@ -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 app/models/user.rb @@ -831,3 +831,4 @@ bg: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/bg.yml @@ -855,3 +855,4 @@ bs: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/bs.yml @@ -834,3 +834,4 @@ ca: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/ca.yml @@ -837,3 +837,4 @@ cs: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/cs.yml @@ -857,3 +857,4 @@ da: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/da.yml @@ -857,3 +857,4 @@ de: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/de.yml @@ -837,3 +837,4 @@ el: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/el.yml @@ -376,6 +376,7 @@ en: label_user: User label_user_plural: Users label_user_new: New user + label_user_anonymous: Anonymous label_project: Project label_project_new: New project label_project_plural: Projects config/locales/en.yml @@ -878,3 +878,4 @@ es: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/es.yml @@ -867,3 +867,4 @@ fi: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/fi.yml @@ -398,6 +398,7 @@ fr: label_user: Utilisateur label_user_plural: Utilisateurs label_user_new: Nouvel utilisateur + label_user_anonymous: Anonyme label_project: Projet label_project_new: Nouveau projet label_project_plural: Projets config/locales/fr.yml @@ -857,3 +857,4 @@ gl: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/gl.yml @@ -841,3 +841,4 @@ he: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/he.yml @@ -862,3 +862,4 @@ version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/hu.yml @@ -844,3 +844,4 @@ it: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/it.yml @@ -866,3 +866,4 @@ ja: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/ja.yml @@ -897,3 +897,4 @@ ko: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/ko.yml @@ -867,3 +867,4 @@ lt: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/lt.yml @@ -819,3 +819,4 @@ nl: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/nl.yml @@ -832,3 +832,4 @@ version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/no.yml @@ -860,3 +860,4 @@ pl: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/pl.yml @@ -863,3 +863,4 @@ pt-BR: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/pt-BR.yml @@ -849,3 +849,4 @@ pt: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/pt.yml @@ -834,3 +834,4 @@ ro: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/ro.yml @@ -945,3 +945,4 @@ ru: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/ru.yml @@ -836,3 +836,4 @@ sk: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/sk.yml @@ -833,3 +833,4 @@ sl: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/sl.yml @@ -852,3 +852,4 @@ version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/sr.yml @@ -885,3 +885,4 @@ sv: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/sv.yml @@ -834,3 +834,4 @@ th: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/th.yml @@ -864,3 +864,4 @@ tr: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/tr.yml @@ -833,3 +833,4 @@ uk: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/uk.yml @@ -896,3 +896,4 @@ vi: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/vi.yml @@ -927,3 +927,4 @@ version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/zh-TW.yml @@ -859,3 +859,4 @@ zh: version_status_locked: locked version_status_open: open error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened + label_user_anonymous: Anonymous config/locales/zh.yml @@ -83,7 +83,7 @@ users_005: users_006: id: 6 created_on: 2006-07-19 19:33:19 +02:00 - status: 1 + status: 0 last_login_on: language: '' hashed_password: 1 test/fixtures/users.yml @@ -483,4 +483,24 @@ EXPECTED Setting.gravatar_enabled = '0' assert_nil avatar(User.find_by_mail('jsmith@somenet.foo')) end + + def test_link_to_user + user = User.find(2) + t = link_to_user(user) + assert_equal "<a href=\"/users/2\">#{ user.name }</a>", t + end + + def test_link_to_user_should_not_link_to_locked_user + user = User.find(5) + assert user.locked? + t = link_to_user(user) + assert_equal user.name, t + end + + def test_link_to_user_should_not_link_to_anonymous + user = User.anonymous + assert user.anonymous? + t = link_to_user(user) + assert_equal ::I18n.t(:label_user_anonymous), t + end end test/unit/helpers/application_helper_test.rb 8f40750ad7f7ad512fd816757f072c42fae20e66 Jean-Philippe Lang jp_lang@yahoo.fr http://github.com/edavis10/redmine/commit/c31411ec0029d5b2033d2d91aef18f601a8a7224 c31411ec0029d5b2033d2d91aef18f601a8a7224 2009-11-11T02:48:54-08:00 2009-11-11T02:48:54-08:00 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 dbbf2414f6d85a7bb05aad58297398fd0e692c99 Jean-Philippe Lang jp_lang@yahoo.fr