jro_apps/redmine Commit - r2910:c31411ec0029

Jicamarca Repository

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

Fixes ApplicationHelper#link_to_user...

Jean-Philippe Lang -

r2910:c31411ec0029

parent child

Context file:

r2910:c31411ec0029

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                  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

                # 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

                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

                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

                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

                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

                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

              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

		@@ -483,4 +483,24 EXPECTED
483	483	Setting.gravatar_enabled = '0'
484	484	assert_nil avatar(User.find_by_mail('jsmith@somenet.foo'))
485	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	506	end