Download as
Browse Code »

Commit 32e6b1fef12caf0eb674f516a39ac88ea418bd82

Authored by Evandro Junior
1 parent 2d3b14bf
Exists in master and in 11 other branches api-security, avoid_duplicated_tasks, layout_fix, proposal_response, proposal_task_category, proposal_task_category_required, proposals_discussion_block, remove_escaped_html, restore_rejected_proposal, staging, tasks_keep_filter_params

fix layout issue https://gitlab.com/participa/noosfero/issues/415

Showing 5 changed files with 25 additions and 6 deletions   Show diff stats
public/proposals_list.js
  Diff comments   View file @32e6b1f
@@ -10,7 +10,7 @@ jQuery(document).ready(function($) { @@ -10,7 +10,7 @@ jQuery(document).ready(function($) {
10 }); 10 });
11 11
12 function proposalsScroll() { 12 function proposalsScroll() {
13 - var scroll = $('.article-body-proposals-discussion-plugin_topic .topic-content .proposals_list .proposals, .article-body-proposals-discussion-plugin_discussion .proposals_list .proposals'); 13 + var scroll = $('.proposals-discussion-infinite-scroll .proposals');
14 var nextSelector = 'div.more a'; 14 var nextSelector = 'div.more a';
15 if(scroll.data('jscroll')) scroll.data('jscroll', null); 15 if(scroll.data('jscroll')) scroll.data('jscroll', null);
16 16
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @32e6b1f
@@ -4,13 +4,13 @@ class ContentViewerControllerTest < ActionController::TestCase @@ -4,13 +4,13 @@ class ContentViewerControllerTest < ActionController::TestCase
4 4
5 def setup 5 def setup
6 @profile = fast_create(Community) 6 @profile = fast_create(Community)
7 - 7 + @person = fast_create(Person)
8 @discussion = ProposalsDiscussionPlugin::Discussion.create!(:name => 'test', :profile => @profile) 8 @discussion = ProposalsDiscussionPlugin::Discussion.create!(:name => 'test', :profile => @profile)
9 @topic = ProposalsDiscussionPlugin::Topic.create!(:name => 'test', :profile => @profile, :parent => @discussion) 9 @topic = ProposalsDiscussionPlugin::Topic.create!(:name => 'test', :profile => @profile, :parent => @discussion)
10 @proposal = ProposalsDiscussionPlugin::Proposal.create!(:name => 'test', :profile => @profile, :parent => @topic, :abstract => "Abstract", :body => "Proposal Body") 10 @proposal = ProposalsDiscussionPlugin::Proposal.create!(:name => 'test', :profile => @profile, :parent => @topic, :abstract => "Abstract", :body => "Proposal Body")
11 end 11 end
12 12
13 - attr_reader :profile, :proposal, :topic, :discussion 13 + attr_reader :profile, :proposal, :topic, :discussion, :person
14 14
15 should 'display custom proposal page' do 15 should 'display custom proposal page' do
16 get :view_page, proposal.url 16 get :view_page, proposal.url
@@ -32,4 +32,19 @@ class ContentViewerControllerTest < ActionController::TestCase @@ -32,4 +32,19 @@ class ContentViewerControllerTest < ActionController::TestCase
32 assert_template 'content_viewer/discussion' 32 assert_template 'content_viewer/discussion'
33 end 33 end
34 34
  35 + should 'do not load class proposals-discussion-infinite-scroll when listing topics' do
  36 + discussion.allow_topics = true
  37 + proposals = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id, :author_id => person.id)
  38 + get :view_page, discussion.url
  39 + assert_no_tag :tag => "div", :attributes => { :class => "proposals-discussion-infinite-scroll" }
  40 + end
  41 +
  42 + should 'load class proposals-discussion-infinite-scroll when listing topics' do
  43 + discussion.allow_topics = true
  44 + proposals = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id, :author_id => person.id)
  45 + get :view_page, topic.url
  46 + assert_tag :tag => "div", :attributes => { :class => "proposals-discussion-infinite-scroll" }
  47 + end
  48 +
  49 +
35 end 50 end
test/unit/proposal_test.rb
  Diff comments   View file @32e6b1f
@@ -5,7 +5,7 @@ class ProposalTest < ActiveSupport::TestCase @@ -5,7 +5,7 @@ class ProposalTest < ActiveSupport::TestCase
5 def setup 5 def setup
6 @profile = fast_create(Community) 6 @profile = fast_create(Community)
7 @person = fast_create(Person) 7 @person = fast_create(Person)
8 - @discussion = ProposalsDiscussionPlugin::Discussion.create!(:name => 'discussion', :profile => person, :name => 'discussion', :allow_topics => false) 8 + @discussion = ProposalsDiscussionPlugin::Discussion.create!(:name => 'discussion', :profile => person, :allow_topics => false)
9 @proposal = ProposalsDiscussionPlugin::Proposal.new(:name => 'test', :abstract => 'abstract', :profile => @profile, :parent => @discussion) 9 @proposal = ProposalsDiscussionPlugin::Proposal.new(:name => 'test', :abstract => 'abstract', :profile => @profile, :parent => @discussion)
10 @proposal.created_by = @person 10 @proposal.created_by = @person
11 end 11 end
views/content_viewer/discussion.html.erb
  Diff comments   View file @32e6b1f
@@ -27,4 +27,6 @@ @@ -27,4 +27,6 @@
27 <%= link_to_new_proposal(discussion) %> 27 <%= link_to_new_proposal(discussion) %>
28 </div> 28 </div>
29 29
30 -<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => discussion} %> 30 +<div class="proposals-discussion-infinite-scroll">
  31 + <%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => discussion} %>
  32 +</div>
views/content_viewer/topic.html.erb
  Diff comments   View file @32e6b1f
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
29 </div> 29 </div>
30 <% end %> 30 <% end %>
31 31
32 -<%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => topic} %> 32 + <div class="<%= list_view ? '' : "proposals-discussion-infinite-scroll" %>">
  33 + <%= render :partial => 'content_viewer/proposals_list', :locals => {:holder => topic} %>
  34 + </div>
33 35
34 </div> 36 </div>