From 32e6b1fef12caf0eb674f516a39ac88ea418bd82 Mon Sep 17 00:00:00 2001
From: Evandro Junior <evandrojr@gmail.com>
Date: Mon, 6 Apr 2015 17:57:48 -0300
Subject: [PATCH] fix layout issue https://gitlab.com/participa/noosfero/issues/415

---
 public/proposals_list.js                          |  2 +-
 test/functional/content_viewer_controller_test.rb | 19 +++++++++++++++++--
 test/unit/proposal_test.rb                        |  2 +-
 views/content_viewer/discussion.html.erb          |  4 +++-
 views/content_viewer/topic.html.erb               |  4 +++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/public/proposals_list.js b/public/proposals_list.js
index b0bde48..5b723a7 100644
--- a/public/proposals_list.js
+++ b/public/proposals_list.js
@@ -10,7 +10,7 @@ jQuery(document).ready(function($) {
   });
 
   function proposalsScroll() {
-    var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals, .article-body-proposals-discussion-plugin_discussion .proposals_list .proposals');
+    var scroll = $('.proposals-discussion-infinite-scroll .proposals');
     var nextSelector = 'div.more a';
     if(scroll.data('jscroll')) scroll.data('jscroll', null);
 
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index 48c35ea..606aa8b 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -4,13 +4,13 @@ class ContentViewerControllerTest < ActionController::TestCase
 
   def setup
     @profile = fast_create(Community)
-
+    @person = fast_create(Person)
     @discussion = ProposalsDiscussionPlugin::Discussion.create!(:name => 'test', :profile => @profile)
     @topic = ProposalsDiscussionPlugin::Topic.create!(:name => 'test', :profile => @profile, :parent => @discussion)
     @proposal = ProposalsDiscussionPlugin::Proposal.create!(:name => 'test', :profile => @profile, :parent => @topic, :abstract => "Abstract", :body => "Proposal Body")
   end
 
-  attr_reader :profile, :proposal, :topic, :discussion
+  attr_reader :profile, :proposal, :topic, :discussion, :person
 
   should 'display custom proposal page' do
     get :view_page, proposal.url
@@ -32,4 +32,19 @@ class ContentViewerControllerTest < ActionController::TestCase
     assert_template 'content_viewer/discussion'
   end
 
+  should 'do not load class proposals-discussion-infinite-scroll when listing topics' do
+    discussion.allow_topics = true
+    proposals = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id, :author_id => person.id)
+    get :view_page, discussion.url
+    assert_no_tag :tag => "div", :attributes => { :class => "proposals-discussion-infinite-scroll" }
+  end
+
+  should 'load class proposals-discussion-infinite-scroll when listing topics' do
+    discussion.allow_topics = true
+    proposals = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id, :author_id => person.id)
+    get :view_page, topic.url
+    assert_tag :tag => "div", :attributes => { :class => "proposals-discussion-infinite-scroll" }
+  end
+
+
 end
diff --git a/test/unit/proposal_test.rb b/test/unit/proposal_test.rb
index abf7980..877bfdc 100644
--- a/test/unit/proposal_test.rb
+++ b/test/unit/proposal_test.rb
@@ -5,7 +5,7 @@ class ProposalTest < ActiveSupport::TestCase
   def setup
     @profile = fast_create(Community)
     @person = fast_create(Person)
-    @discussion = ProposalsDiscussionPlugin::Discussion.create!(:name => 'discussion', :profile => person, :name => 'discussion', :allow_topics => false)
+    @discussion = ProposalsDiscussionPlugin::Discussion.create!(:name => 'discussion', :profile => person, :allow_topics => false)
     @proposal = ProposalsDiscussionPlugin::Proposal.new(:name => 'test', :abstract => 'abstract', :profile => @profile, :parent => @discussion)
     @proposal.created_by = @person
   end
diff --git a/views/content_viewer/discussion.html.erb b/views/content_viewer/discussion.html.erb
index 7ecd427..336c75f 100644
--- a/views/content_viewer/discussion.html.erb
+++ b/views/content_viewer/discussion.html.erb
@@ -27,4 +27,6 @@
   <%= link_to_new_proposal(discussion) %>
 </div>
 
-<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => discussion} %>
+<div class="proposals-discussion-infinite-scroll">
+  <%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => discussion} %>
+</div>
diff --git a/views/content_viewer/topic.html.erb b/views/content_viewer/topic.html.erb
index 03b6fa9..7b6e90d 100644
--- a/views/content_viewer/topic.html.erb
+++ b/views/content_viewer/topic.html.erb
@@ -29,6 +29,8 @@
   </div>
 <% end %>
 
-<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => topic} %>
+  <div class="<%= list_view ? '' : "proposals-discussion-infinite-scroll"  %>">
+    <%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => topic} %>
+  </div>
 
 </div>
--
libgit2 0.21.2