Download as
Browse Code »

Commit 401a2773d7732352a5dedae45fc5033be55714dd

Authored by Rodrigo Souto
1 parent 3f355c74
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

profile-helper: avoid method name conflict

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
app/helpers/profile_helper.rb
  Diff comments   View file @401a277
... ... @@ -62,7 +62,7 @@ module ProfileHelper
62 62 end
63 63  
64 64 def title(field, entry = nil)
65   - return self.send("#{field}_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
  65 + return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
66 66 CUSTOM_LABELS[field.to_sym] || field.to_s.humanize
67 67 end
68 68  
... ... @@ -154,13 +154,13 @@ module ProfileHelper
154 154 link_to interest.name, :controller => 'search', :action => 'category_index', :category_path => interest.explode_path
155 155 end
156 156  
157   - def article_title(article)
  157 + def article_custom_title(article)
158 158 article.name
159 159 end
160   - alias :blogs_title :article_title
161   - alias :image_galleries_title :article_title
  160 + alias :blogs_custom_title :article_custom_title
  161 + alias :image_galleries_custom_title :article_custom_title
162 162  
163   - def interests_title(interest)
  163 + def interests_custom_title(interest)
164 164 ''
165 165 end
166 166  
... ...