@@ -44,12 +44,17 module ApplicationHelper | |||||
44 | link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action]) |
|
44 | link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action]) | |
45 | end |
|
45 | end | |
46 |
|
46 | |||
47 | # Display a link to user's account page |
|
47 | # Displays a link to user's account page if active | |
48 | def link_to_user(user, options={}) |
|
48 | def link_to_user(user, options={}) | |
49 | if user.is_a?(User) |
|
49 | if user.is_a?(User) | |
50 | !user.anonymous? ? link_to(user.name(options[:format]), :controller => 'users', :action => 'show', :id => user) : 'Anonymous' |
|
50 | name = h(user.name(options[:format])) | |
|
51 | if user.active? | |||
|
52 | link_to name, :controller => 'users', :action => 'show', :id => user | |||
|
53 | else | |||
|
54 | name | |||
|
55 | end | |||
51 | else |
|
56 | else | |
52 | user.to_s |
|
57 | h(user.to_s) | |
53 | end |
|
58 | end | |
54 | end |
|
59 | end | |
55 |
|
60 |
@@ -346,7 +346,7 class AnonymousUser < User | |||||
346 | # Overrides a few properties |
|
346 | # Overrides a few properties | |
347 | def logged?; false end |
|
347 | def logged?; false end | |
348 | def admin; false end |
|
348 | def admin; false end | |
349 |
def name; |
|
349 | def name(*args); I18n.t(:label_user_anonymous) end | |
350 | def mail; nil end |
|
350 | def mail; nil end | |
351 | def time_zone; nil end |
|
351 | def time_zone; nil end | |
352 | def rss_key; nil end |
|
352 | def rss_key; nil end |
@@ -831,3 +831,4 bg: | |||||
831 | version_status_locked: locked |
|
831 | version_status_locked: locked | |
832 | version_status_open: open |
|
832 | version_status_open: open | |
833 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
833 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
834 | label_user_anonymous: Anonymous |
@@ -855,3 +855,4 bs: | |||||
855 | version_status_locked: locked |
|
855 | version_status_locked: locked | |
856 | version_status_open: open |
|
856 | version_status_open: open | |
857 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
857 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
858 | label_user_anonymous: Anonymous |
@@ -834,3 +834,4 ca: | |||||
834 | version_status_locked: locked |
|
834 | version_status_locked: locked | |
835 | version_status_open: open |
|
835 | version_status_open: open | |
836 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
836 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
837 | label_user_anonymous: Anonymous |
@@ -837,3 +837,4 cs: | |||||
837 | version_status_locked: locked |
|
837 | version_status_locked: locked | |
838 | version_status_open: open |
|
838 | version_status_open: open | |
839 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
839 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
840 | label_user_anonymous: Anonymous |
@@ -857,3 +857,4 da: | |||||
857 | version_status_locked: locked |
|
857 | version_status_locked: locked | |
858 | version_status_open: open |
|
858 | version_status_open: open | |
859 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
859 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
860 | label_user_anonymous: Anonymous |
@@ -857,3 +857,4 de: | |||||
857 | version_status_locked: locked |
|
857 | version_status_locked: locked | |
858 | version_status_open: open |
|
858 | version_status_open: open | |
859 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
859 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
860 | label_user_anonymous: Anonymous |
@@ -837,3 +837,4 el: | |||||
837 | version_status_locked: locked |
|
837 | version_status_locked: locked | |
838 | version_status_open: open |
|
838 | version_status_open: open | |
839 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
839 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
840 | label_user_anonymous: Anonymous |
@@ -376,6 +376,7 en: | |||||
376 | label_user: User |
|
376 | label_user: User | |
377 | label_user_plural: Users |
|
377 | label_user_plural: Users | |
378 | label_user_new: New user |
|
378 | label_user_new: New user | |
|
379 | label_user_anonymous: Anonymous | |||
379 | label_project: Project |
|
380 | label_project: Project | |
380 | label_project_new: New project |
|
381 | label_project_new: New project | |
381 | label_project_plural: Projects |
|
382 | label_project_plural: Projects |
@@ -878,3 +878,4 es: | |||||
878 | version_status_locked: locked |
|
878 | version_status_locked: locked | |
879 | version_status_open: open |
|
879 | version_status_open: open | |
880 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
880 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
881 | label_user_anonymous: Anonymous |
@@ -867,3 +867,4 fi: | |||||
867 | version_status_locked: locked |
|
867 | version_status_locked: locked | |
868 | version_status_open: open |
|
868 | version_status_open: open | |
869 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
869 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
870 | label_user_anonymous: Anonymous |
@@ -398,6 +398,7 fr: | |||||
398 | label_user: Utilisateur |
|
398 | label_user: Utilisateur | |
399 | label_user_plural: Utilisateurs |
|
399 | label_user_plural: Utilisateurs | |
400 | label_user_new: Nouvel utilisateur |
|
400 | label_user_new: Nouvel utilisateur | |
|
401 | label_user_anonymous: Anonyme | |||
401 | label_project: Projet |
|
402 | label_project: Projet | |
402 | label_project_new: Nouveau projet |
|
403 | label_project_new: Nouveau projet | |
403 | label_project_plural: Projets |
|
404 | label_project_plural: Projets |
@@ -857,3 +857,4 gl: | |||||
857 | version_status_locked: locked |
|
857 | version_status_locked: locked | |
858 | version_status_open: open |
|
858 | version_status_open: open | |
859 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
859 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
860 | label_user_anonymous: Anonymous |
@@ -841,3 +841,4 he: | |||||
841 | version_status_locked: locked |
|
841 | version_status_locked: locked | |
842 | version_status_open: open |
|
842 | version_status_open: open | |
843 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
843 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
844 | label_user_anonymous: Anonymous |
@@ -862,3 +862,4 | |||||
862 | version_status_locked: locked |
|
862 | version_status_locked: locked | |
863 | version_status_open: open |
|
863 | version_status_open: open | |
864 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
864 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
865 | label_user_anonymous: Anonymous |
@@ -844,3 +844,4 it: | |||||
844 | version_status_locked: locked |
|
844 | version_status_locked: locked | |
845 | version_status_open: open |
|
845 | version_status_open: open | |
846 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
846 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
847 | label_user_anonymous: Anonymous |
@@ -866,3 +866,4 ja: | |||||
866 | version_status_locked: locked |
|
866 | version_status_locked: locked | |
867 | version_status_open: open |
|
867 | version_status_open: open | |
868 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
868 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
869 | label_user_anonymous: Anonymous |
@@ -897,3 +897,4 ko: | |||||
897 | version_status_locked: locked |
|
897 | version_status_locked: locked | |
898 | version_status_open: open |
|
898 | version_status_open: open | |
899 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
899 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
900 | label_user_anonymous: Anonymous |
@@ -867,3 +867,4 lt: | |||||
867 | version_status_locked: locked |
|
867 | version_status_locked: locked | |
868 | version_status_open: open |
|
868 | version_status_open: open | |
869 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
869 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
870 | label_user_anonymous: Anonymous |
@@ -819,3 +819,4 nl: | |||||
819 | version_status_locked: locked |
|
819 | version_status_locked: locked | |
820 | version_status_open: open |
|
820 | version_status_open: open | |
821 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
821 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
822 | label_user_anonymous: Anonymous |
@@ -832,3 +832,4 | |||||
832 | version_status_locked: locked |
|
832 | version_status_locked: locked | |
833 | version_status_open: open |
|
833 | version_status_open: open | |
834 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
834 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
835 | label_user_anonymous: Anonymous |
@@ -860,3 +860,4 pl: | |||||
860 | version_status_locked: locked |
|
860 | version_status_locked: locked | |
861 | version_status_open: open |
|
861 | version_status_open: open | |
862 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
862 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
863 | label_user_anonymous: Anonymous |
@@ -863,3 +863,4 pt-BR: | |||||
863 | version_status_locked: locked |
|
863 | version_status_locked: locked | |
864 | version_status_open: open |
|
864 | version_status_open: open | |
865 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
865 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
866 | label_user_anonymous: Anonymous |
@@ -849,3 +849,4 pt: | |||||
849 | version_status_locked: locked |
|
849 | version_status_locked: locked | |
850 | version_status_open: open |
|
850 | version_status_open: open | |
851 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
851 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
852 | label_user_anonymous: Anonymous |
@@ -834,3 +834,4 ro: | |||||
834 | version_status_locked: locked |
|
834 | version_status_locked: locked | |
835 | version_status_open: open |
|
835 | version_status_open: open | |
836 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
836 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
837 | label_user_anonymous: Anonymous |
@@ -945,3 +945,4 ru: | |||||
945 | version_status_locked: locked |
|
945 | version_status_locked: locked | |
946 | version_status_open: open |
|
946 | version_status_open: open | |
947 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
947 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
948 | label_user_anonymous: Anonymous |
@@ -836,3 +836,4 sk: | |||||
836 | version_status_locked: locked |
|
836 | version_status_locked: locked | |
837 | version_status_open: open |
|
837 | version_status_open: open | |
838 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
838 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
839 | label_user_anonymous: Anonymous |
@@ -833,3 +833,4 sl: | |||||
833 | version_status_locked: locked |
|
833 | version_status_locked: locked | |
834 | version_status_open: open |
|
834 | version_status_open: open | |
835 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
835 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
836 | label_user_anonymous: Anonymous |
@@ -852,3 +852,4 | |||||
852 | version_status_locked: locked |
|
852 | version_status_locked: locked | |
853 | version_status_open: open |
|
853 | version_status_open: open | |
854 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
854 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
855 | label_user_anonymous: Anonymous |
@@ -885,3 +885,4 sv: | |||||
885 | version_status_locked: locked |
|
885 | version_status_locked: locked | |
886 | version_status_open: open |
|
886 | version_status_open: open | |
887 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
887 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
888 | label_user_anonymous: Anonymous |
@@ -834,3 +834,4 th: | |||||
834 | version_status_locked: locked |
|
834 | version_status_locked: locked | |
835 | version_status_open: open |
|
835 | version_status_open: open | |
836 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
836 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
837 | label_user_anonymous: Anonymous |
@@ -864,3 +864,4 tr: | |||||
864 | version_status_locked: locked |
|
864 | version_status_locked: locked | |
865 | version_status_open: open |
|
865 | version_status_open: open | |
866 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
866 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
867 | label_user_anonymous: Anonymous |
@@ -833,3 +833,4 uk: | |||||
833 | version_status_locked: locked |
|
833 | version_status_locked: locked | |
834 | version_status_open: open |
|
834 | version_status_open: open | |
835 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
835 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
836 | label_user_anonymous: Anonymous |
@@ -896,3 +896,4 vi: | |||||
896 | version_status_locked: locked |
|
896 | version_status_locked: locked | |
897 | version_status_open: open |
|
897 | version_status_open: open | |
898 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
898 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
899 | label_user_anonymous: Anonymous |
@@ -927,3 +927,4 | |||||
927 | version_status_locked: locked |
|
927 | version_status_locked: locked | |
928 | version_status_open: open |
|
928 | version_status_open: open | |
929 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
929 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
930 | label_user_anonymous: Anonymous |
@@ -859,3 +859,4 zh: | |||||
859 | version_status_locked: locked |
|
859 | version_status_locked: locked | |
860 | version_status_open: open |
|
860 | version_status_open: open | |
861 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened |
|
861 | error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened | |
|
862 | label_user_anonymous: Anonymous |
@@ -83,7 +83,7 users_005: | |||||
83 | users_006: |
|
83 | users_006: | |
84 | id: 6 |
|
84 | id: 6 | |
85 | created_on: 2006-07-19 19:33:19 +02:00 |
|
85 | created_on: 2006-07-19 19:33:19 +02:00 | |
86 |
status: |
|
86 | status: 0 | |
87 | last_login_on: |
|
87 | last_login_on: | |
88 | language: '' |
|
88 | language: '' | |
89 | hashed_password: 1 |
|
89 | hashed_password: 1 |
@@ -483,4 +483,24 EXPECTED | |||||
483 | Setting.gravatar_enabled = '0' |
|
483 | Setting.gravatar_enabled = '0' | |
484 | assert_nil avatar(User.find_by_mail('jsmith@somenet.foo')) |
|
484 | assert_nil avatar(User.find_by_mail('jsmith@somenet.foo')) | |
485 | end |
|
485 | end | |
|
486 | ||||
|
487 | def test_link_to_user | |||
|
488 | user = User.find(2) | |||
|
489 | t = link_to_user(user) | |||
|
490 | assert_equal "<a href=\"/users/2\">#{ user.name }</a>", t | |||
|
491 | end | |||
|
492 | ||||
|
493 | def test_link_to_user_should_not_link_to_locked_user | |||
|
494 | user = User.find(5) | |||
|
495 | assert user.locked? | |||
|
496 | t = link_to_user(user) | |||
|
497 | assert_equal user.name, t | |||
|
498 | end | |||
|
499 | ||||
|
500 | def test_link_to_user_should_not_link_to_anonymous | |||
|
501 | user = User.anonymous | |||
|
502 | assert user.anonymous? | |||
|
503 | t = link_to_user(user) | |||
|
504 | assert_equal ::I18n.t(:label_user_anonymous), t | |||
|
505 | end | |||
486 | end |
|
506 | end |
General Comments 0
You need to be logged in to leave comments.
Login now