Commit 86e78cea authored by jplang's avatar jplang

Anonymous icon is wrongly displayed when assignee is a group (#28208).

Patch by Go MAEDA.

git-svn-id: https://svn.redmine.org/redmine/trunk@17263 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 21b2b45b
......@@ -1407,10 +1407,12 @@ module ApplicationHelper
end
if email.present?
gravatar(email.to_s.downcase, options) rescue nil
else
elsif user.is_a?(AnonymousUser)
image_tag 'anonymous.png',
GravatarHelper::DEFAULT_OPTIONS
.except(:default, :rating, :ssl).merge(options)
else
nil
end
else
''
......
......@@ -1287,7 +1287,6 @@ RAW
end
def test_avatar_enabled
tag_for_anonymous_re = %r{src="/images/anonymous.png(\?\d+)?"}
with_settings :gravatar_enabled => '1' do
assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
......@@ -1299,10 +1298,12 @@ RAW
# The default class of the img tag should be gravatar
assert avatar('jsmith <jsmith@somenet.foo>').include?('class="gravatar"')
assert !avatar('jsmith <jsmith@somenet.foo>', :class => 'picture').include?('class="gravatar"')
assert_match tag_for_anonymous_re, avatar('jsmith')
assert_match tag_for_anonymous_re, avatar(nil)
assert_nil avatar('jsmith')
assert_nil avatar(nil)
# Avatar for anonymous user
assert_match tag_for_anonymous_re, avatar(User.anonymous)
assert_match %r{src="/images/anonymous.png(\?\d+)?"}, avatar(User.anonymous)
# No avatar for groups
assert_nil avatar(Group.first)
assert avatar(User.anonymous, :size => 24).include?('width="24" height="24"')
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment