diff --git a/lib/proposals_discussion_plugin/discussion.rb b/lib/proposals_discussion_plugin/discussion.rb
index e1fd7fb..1d7ab19 100644
--- a/lib/proposals_discussion_plugin/discussion.rb
+++ b/lib/proposals_discussion_plugin/discussion.rb
@@ -18,8 +18,9 @@ class ProposalsDiscussionPlugin::Discussion < Folder
   end
 
   def to_html(options = {})
+    discussion = self
     proc do
-      render :file => 'content_viewer/discussion'
+      render :file => 'content_viewer/discussion', :locals => {:discussion => discussion}
     end
   end
 
diff --git a/lib/proposals_discussion_plugin/proposal.rb b/lib/proposals_discussion_plugin/proposal.rb
index f210470..a0146c8 100644
--- a/lib/proposals_discussion_plugin/proposal.rb
+++ b/lib/proposals_discussion_plugin/proposal.rb
@@ -17,9 +17,10 @@ class ProposalsDiscussionPlugin::Proposal < TinyMceArticle
 
 
   def to_html(options = {})
+    proposal = self
     unless options[:feed]
       proc do
-        render :file => 'content_viewer/proposal'
+        render :file => 'content_viewer/proposal', :locals => {:proposal => proposal}
       end
     else
       body
diff --git a/lib/proposals_discussion_plugin/topic.rb b/lib/proposals_discussion_plugin/topic.rb
index 57ace32..5c98896 100644
--- a/lib/proposals_discussion_plugin/topic.rb
+++ b/lib/proposals_discussion_plugin/topic.rb
@@ -23,8 +23,9 @@ class ProposalsDiscussionPlugin::Topic < Folder
   end
 
   def to_html(options = {})
+    topic = self
     proc do
-      render :file => 'content_viewer/topic', :locals => {:topic => @page}
+      render :file => 'content_viewer/topic', :locals => {:topic => topic}
     end
   end
 
diff --git a/test/functional/proposals_discussion_plugin_public_controller_test.rb b/test/functional/proposals_discussion_plugin_public_controller_test.rb
index 11d394c..189991b 100644
--- a/test/functional/proposals_discussion_plugin_public_controller_test.rb
+++ b/test/functional/proposals_discussion_plugin_public_controller_test.rb
@@ -50,17 +50,14 @@ class ProposalsDiscussionPluginPublicControllerTest < ActionController::TestCase
   end
 
   should 'load proposals with most recent order' do
-    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'z', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
-    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'b', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
-    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'k', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)
+    proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'z', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id, :created_at => Date.today - 2.day)
+    proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'b', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id, :created_at => Date.today - 1.day)
+    proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'k', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id, :created_at => Date.today)
 
     author = fast_create(Person)
-    Comment.create!(:source => proposal2, :body => 'text', :author => author)
-    Comment.create!(:source => proposal2, :body => 'text', :author => author)
-    Comment.create!(:source => proposal3, :body => 'text', :author => author)
 
     get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'recent'
-    assert_equal [proposal3, proposal2, proposal1], assigns(:proposals)
+    assert_equal [proposal3, proposal2, proposal1].map(&:name), assigns(:proposals).map(&:name)
   end
 
   should 'load proposals with most recently commented order' do
diff --git a/views/content_viewer/discussion.html.erb b/views/content_viewer/discussion.html.erb
index 421a4a8..25c43d3 100644
--- a/views/content_viewer/discussion.html.erb
+++ b/views/content_viewer/discussion.html.erb
@@ -1,14 +1,14 @@
 <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
 
-<%= add_rss_feed_to_head(@page.name, @page.feed.url) if @page.feed %>
+<%= add_rss_feed_to_head(discussion.name, discussion.feed.url) if discussion.feed %>
 
 <div class="description">
-  <%= @page.body %>
+  <%= discussion.body %>
 </div>
 
-<% if @page.allow_create?(user) %>
+<% if discussion.allow_create?(user) %>
 <div class="actions">
-  <%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Topic", :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
+  <%= link_to url_for({:controller => 'cms', :action => 'new', :type => "ProposalsDiscussionPlugin::Topic", :parent_id => discussion.id}), :class => 'button with-text icon-add' do %>
     <strong><%= _("New Topic") %></strong>
   <% end %>
 </div>
@@ -17,11 +17,11 @@
 <div class="topics js-masonry" data-masonry-options='{ "itemSelector": ".topic-item", "columnWidth": 200 }'>
   <div class="actions topic-item">
     <div class="topic-color"></div>
-    <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'select_topic', :parent_id => @page.id}), :class => 'button with-text icon-add' do %>
+    <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'select_topic', :parent_id => discussion.id}), :class => 'button with-text icon-add' do %>
       <strong><%= _("Send your proposal!") %></strong>
     <% end %>
   </div>
-  <% @page.topics.includes(:profile).each do |topic| %>
+  <% discussion.topics.includes(:profile).each do |topic| %>
     <div class="topic-item" id="topic-<%= topic.id %>">
       <%= render :file => 'content_viewer/topic', :locals => {:topic => topic, :list_view => true} %>
     </div>
diff --git a/views/content_viewer/proposal.html.erb b/views/content_viewer/proposal.html.erb
index 823f351..02702f6 100644
--- a/views/content_viewer/proposal.html.erb
+++ b/views/content_viewer/proposal.html.erb
@@ -1,31 +1,31 @@
 <div class="discussion">
-  <h5><%= @page.topic.discussion.title %> </h5>
+  <h5><%= proposal.topic.discussion.title %> </h5>
 </div>
 
 <% extend ProposalsDiscussionPlugin::TopicHelper %>
 
 <div class="topic">
-  <%= topic_title @page.topic %>
+  <%= topic_title proposal.topic %>
 </div>
 
 <div class="title">
   <h5><%= _('Title') %></h4>
-  <div class="content"><%= @page.title %></div>
+  <div class="content"><%= proposal.title %></div>
 </div>
 
 <div class="abstract">
   <h5><%= _('Abstract') %></h4>
-  <div class="content"><%= @page.abstract %></div>
+  <div class="content"><%= proposal.abstract %></div>
 </div>
 
 <div class="body">
-  <h5><%= @page.topic.discussion.custom_body_label %></h4>
-  <div class="content"><%= @page.body %></div>
+  <h5><%= proposal.topic.discussion.custom_body_label %></h4>
+  <div class="content"><%= proposal.body %></div>
 </div>
 
-<% if @page.created_by == user && !@page.published %>
+<% if proposal.created_by == user && !proposal.published %>
 <div class="actions">
-  <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'publish_proposal', :proposal_id => @page.id}), :class => 'button with-text icon-suggest' do %>
+  <%= link_to url_for({:controller => 'proposals_discussion_plugin_myprofile', :action => 'publish_proposal', :proposal_id => proposal.id}), :class => 'button with-text icon-suggest' do %>
     <strong><%= _("Publish") %></strong>
   <% end %>
 </div>
--
libgit2 0.21.2