Download as
Browse Code »

Commit ce6338053dd6cd2060eef580b6a6204f5b63cb2c

Authored by Braulio Bhavamitra
1 parent f8bfab0f
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

event: fix lead

Showing 3 changed files with 25 additions and 4 deletions   Show diff stats
app/models/event.rb
  Diff comments   View file @ce63380
@@ -145,11 +145,9 @@ class Event < Article @@ -145,11 +145,9 @@ class Event < Article
145 ((self.end_date || self.start_date) - self.start_date).to_i 145 ((self.end_date || self.start_date) - self.start_date).to_i
146 end 146 end
147 147
  148 + alias_method :article_lead, :lead
148 def lead 149 def lead
149 - content_tag('div',  
150 - show_period(start_date, end_date),  
151 - :class => 'event-dates'  
152 - ) + super 150 + self.class.action_view.render 'content_viewer/event_lead', event: self
153 end 151 end
154 152
155 def event? 153 def event?
app/views/content_viewer/_event_lead.html.erb 0 → 100644
  Diff comments   View file @ce63380
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
  1 +
  2 +<div class="event-dates">
  3 + <%= show_period event.start_date, event.end_date %>
  4 +</div>
  5 +
  6 +<%= event.article_lead %>
  7 +
lib/noosfero/core_ext/active_record.rb
  Diff comments   View file @ce63380
@@ -6,6 +6,22 @@ class ActiveRecord::Base @@ -6,6 +6,22 @@ class ActiveRecord::Base
6 ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' 6 ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
7 end 7 end
8 8
  9 + # an ActionView instance for rendering views on models
  10 + def self.action_view
  11 + @action_view ||= begin
  12 + view_paths = ActionController::Base.view_paths
  13 + action_view = ActionView::Base.new view_paths
  14 + # for using Noosfero helpers inside render calls
  15 + action_view.extend ApplicationHelper
  16 + action_view
  17 + end
  18 + end
  19 +
  20 + # default value needed for the above ActionView
  21 + def to_partial_path
  22 + self.class.name.underscore
  23 + end
  24 +
9 alias :meta_cache_key :cache_key 25 alias :meta_cache_key :cache_key
10 def cache_key 26 def cache_key
11 key = [Noosfero::VERSION, meta_cache_key] 27 key = [Noosfero::VERSION, meta_cache_key]