From ce6338053dd6cd2060eef580b6a6204f5b63cb2c Mon Sep 17 00:00:00 2001
From: Braulio Bhavamitra <braulio@eita.org.br>
Date: Mon, 9 Mar 2015 17:39:20 -0300
Subject: [PATCH] event: fix lead

---
 app/models/event.rb                           |  6 ++----
 app/views/content_viewer/_event_lead.html.erb |  7 +++++++
 lib/noosfero/core_ext/active_record.rb        | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 app/views/content_viewer/_event_lead.html.erb

diff --git a/app/models/event.rb b/app/models/event.rb
index f1548a4..12e2993 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -145,11 +145,9 @@ class Event < Article
     ((self.end_date || self.start_date) - self.start_date).to_i
   end
 
+  alias_method :article_lead, :lead
   def lead
-    content_tag('div',
-      show_period(start_date, end_date),
-      :class => 'event-dates'
-    ) + super
+    self.class.action_view.render 'content_viewer/event_lead', event: self
   end
 
   def event?
diff --git a/app/views/content_viewer/_event_lead.html.erb b/app/views/content_viewer/_event_lead.html.erb
new file mode 100644
index 0000000..1c27e72
--- /dev/null
+++ b/app/views/content_viewer/_event_lead.html.erb
@@ -0,0 +1,7 @@
+
+<div class="event-dates">
+  <%= show_period event.start_date, event.end_date %>
+</div>
+
+<%= event.article_lead %>
+
diff --git a/lib/noosfero/core_ext/active_record.rb b/lib/noosfero/core_ext/active_record.rb
index 186ce4b..8d94d49 100644
--- a/lib/noosfero/core_ext/active_record.rb
+++ b/lib/noosfero/core_ext/active_record.rb
@@ -6,6 +6,22 @@ class ActiveRecord::Base
     ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
   end
 
+  # an ActionView instance for rendering views on models
+  def self.action_view
+    @action_view ||= begin
+      view_paths = ActionController::Base.view_paths
+      action_view = ActionView::Base.new view_paths
+      # for using Noosfero helpers inside render calls
+      action_view.extend ApplicationHelper
+      action_view
+    end
+  end
+
+  # default value needed for the above ActionView
+  def to_partial_path
+    self.class.name.underscore
+  end
+
   alias :meta_cache_key :cache_key
   def cache_key
     key = [Noosfero::VERSION, meta_cache_key]
--
libgit2 0.21.2