mirror of
https://github.com/meineerde/redmine.git
synced 2026-01-31 11:37:14 +00:00
Use double splat operator for icons methods that are extending @sprite_icon@ (#23980).
git-svn-id: https://svn.redmine.org/redmine/trunk@23229 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
505981c682
commit
1af8168426
@ -36,20 +36,20 @@ module IconsHelper
|
||||
end
|
||||
end
|
||||
|
||||
def file_icon(entry, name, size: DEFAULT_ICON_SIZE, css_class: nil)
|
||||
def file_icon(entry, name, **options)
|
||||
if entry.is_dir?
|
||||
sprite_icon("folder", name, size: size, css_class: css_class)
|
||||
sprite_icon("folder", name, **options)
|
||||
else
|
||||
icon_name = icon_for_mime_type(Redmine::MimeType.css_class_of(name))
|
||||
sprite_icon(icon_name, name, size: size, css_class: css_class)
|
||||
sprite_icon(icon_name, name, **options)
|
||||
end
|
||||
end
|
||||
|
||||
def principal_icon(principal_class, size: DEFAULT_ICON_SIZE, css_class: nil)
|
||||
sprite_icon('group', size: size, css_class: css_class) if ['groupanonymous', 'groupnonmember', 'group'].include?(principal_class)
|
||||
def principal_icon(principal_class, **options)
|
||||
sprite_icon('group', **options) if ['groupanonymous', 'groupnonmember', 'group'].include?(principal_class)
|
||||
end
|
||||
|
||||
def activity_event_type_icon(event_type, size: DEFAULT_ICON_SIZE, css_class: nil)
|
||||
def activity_event_type_icon(event_type, **options)
|
||||
icon_name = case event_type
|
||||
when 'reply'
|
||||
'comments'
|
||||
@ -61,7 +61,7 @@ module IconsHelper
|
||||
event_type
|
||||
end
|
||||
|
||||
sprite_icon(icon_name, size: size, css_class: css_class)
|
||||
sprite_icon(icon_name, **options)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user