From 401a2773d7732352a5dedae45fc5033be55714dd Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 9 Oct 2014 16:02:32 -0300 Subject: [PATCH] profile-helper: avoid method name conflict --- app/helpers/profile_helper.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index ee7d476..fbccbbe 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -62,7 +62,7 @@ module ProfileHelper end def title(field, entry = nil) - return self.send("#{field}_title", entry) if MULTIPLE[kind].include?(field) && entry.present? + return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present? CUSTOM_LABELS[field.to_sym] || field.to_s.humanize end @@ -154,13 +154,13 @@ module ProfileHelper link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path end - def article_title(article) + def article_custom_title(article) article.name end - alias :blogs_title :article_title - alias :image_galleries_title :article_title + alias :blogs_custom_title :article_custom_title + alias :image_galleries_custom_title :article_custom_title - def interests_title(interest) + def interests_custom_title(interest) '' end -- libgit2 0.21.2