From 4f3d75326cb8a2f94a93bb3a32bf204ddfab806b Mon Sep 17 00:00:00 2001 From: Andreas Brandl Date: Fri, 9 Feb 2018 22:55:16 +0100 Subject: Extract method to improve readability. --- app/helpers/avatars_helper.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb index 16e9fbfd3aa..21b6c0a8ad5 100644 --- a/app/helpers/avatars_helper.rb +++ b/app/helpers/avatars_helper.rb @@ -8,17 +8,21 @@ module AvatarsHelper })) end + def user_avatar_url_for(options = {}) + if options[:url] + options[:url] + elsif options[:user] + avatar_icon_for_user(options[:user], options[:size]) + else + avatar_icon_for_email(options[:user_email], options[:size]) + end + end + def user_avatar_without_link(options = {}) avatar_size = options[:size] || 16 user_name = options[:user].try(:name) || options[:user_name] - avatar_url = if options[:url] - options[:url] - elsif options[:user] - avatar_icon_for_user(options[:user], avatar_size) - else - avatar_icon_for_email(options[:user_email], avatar_size) - end + avatar_url = user_avatar_url_for(options.merge(size: avatar_size)) has_tooltip = options[:has_tooltip].nil? ? true : options[:has_tooltip] data_attributes = options[:data] || {} -- cgit v1.2.1