Download as
Browse Code »

Commit 69f8cd9fa75b852a1abbf2e3dc34980569ce2a1b

Authored by Antonio Terceiro
1 parent 6ae99cef
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

Do not display templates in new profile listings 

(ActionItem1588)
Showing 2 changed files with 16 additions and 2 deletions   Show diff stats
app/controllers/public/browse_controller.rb
  Diff comments   View file @69f8cd9
@@ -12,7 +12,7 @@ class BrowseController < PublicController @@ -12,7 +12,7 @@ class BrowseController < PublicController
12 @filter = filter 12 @filter = filter
13 @title = self.filter_description(params[:action] + '_' + @filter ) 13 @title = self.filter_description(params[:action] + '_' + @filter )
14 14
15 - @results = @environment.people.send(@filter) 15 + @results = @environment.people.visible.send(@filter)
16 16
17 if params[:query].blank? 17 if params[:query].blank?
18 @results = @results.paginate(:per_page => 27, :page => params[:page]) 18 @results = @results.paginate(:per_page => 27, :page => params[:page])
@@ -25,7 +25,7 @@ class BrowseController < PublicController @@ -25,7 +25,7 @@ class BrowseController < PublicController
25 @filter = filter 25 @filter = filter
26 @title = self.filter_description(params[:action] + '_' + @filter ) 26 @title = self.filter_description(params[:action] + '_' + @filter )
27 27
28 - @results = @environment.communities.send(@filter) 28 + @results = @environment.communities.visible.send(@filter)
29 29
30 if params[:query].blank? 30 if params[:query].blank?
31 @results = @results.paginate(:per_page => 27, :page => params[:page]) 31 @results = @results.paginate(:per_page => 27, :page => params[:page])
test/functional/browse_controller_test.rb
  Diff comments   View file @69f8cd9
@@ -218,4 +218,18 @@ class BrowseControllerTest < Test::Unit::TestCase @@ -218,4 +218,18 @@ class BrowseControllerTest < Test::Unit::TestCase
218 assert_tag :h1, :content => 'More recent communities' 218 assert_tag :h1, :content => 'More recent communities'
219 end 219 end
220 220
  221 + should "only include visible people in more_recent filter" do
  222 + # assuming that all filters behave the same!
  223 + p1 = fast_create(Person, :visible => false)
  224 + get :people, :filter => 'more_recent'
  225 + assert_not_includes assigns(:results), p1
  226 + end
  227 +
  228 + should "only include visible communities in more_recent filter" do
  229 + # assuming that all filters behave the same!
  230 + p1 = fast_create(Community, :visible => false)
  231 + get :communities, :filter => 'more_recent'
  232 + assert_not_includes assigns(:results), p1
  233 + end
  234 +
221 end 235 end