Download as
Browse Code »

Commit e18f5e915d22cc29bca424b6804c39d0bee63469

Authored by Leandro Santos
Committed by Rodrigo Souto
1 parent 3df1c0d2
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

adding named scope visible_for_person

Showing 3 changed files with 10 additions and 2 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @e18f5e9
@@ -145,6 +145,14 @@ class Profile < ActiveRecord::Base @@ -145,6 +145,14 @@ class Profile < ActiveRecord::Base
145 scope :public, :conditions => { :visible => true, :public_profile => true, :secret => false } 145 scope :public, :conditions => { :visible => true, :public_profile => true, :secret => false }
146 scope :enabled, :conditions => { :enabled => true } 146 scope :enabled, :conditions => { :enabled => true }
147 147
  148 + scope :visible_for_person, lambda { |person|
  149 + joins('LEFT JOIN "role_assignments" ON "role_assignments"."resource_id" = "profiles"."id" AND "role_assignments"."resource_type" = \'Profile\'')
  150 + .where(
  151 + ['( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR
  152 + (profiles.public_profile = ?) )', Profile.name, person.id, true]
  153 + )
  154 + }
  155 +
148 # Subclasses must override this method 156 # Subclasses must override this method
149 scope :more_popular 157 scope :more_popular
150 158
lib/api/v1/communities.rb
  Diff comments   View file @e18f5e9
@@ -17,7 +17,7 @@ module API @@ -17,7 +17,7 @@ module API
17 # GET /communities?reference_id=10&limit=10&oldest 17 # GET /communities?reference_id=10&limit=10&oldest
18 get do 18 get do
19 communities = select_filtered_collection_of(environment, 'communities', params) 19 communities = select_filtered_collection_of(environment, 'communities', params)
20 - communities = communities.visible 20 + communities = communities.visible_for_person(current_person)
21 present communities, :with => Entities::Community 21 present communities, :with => Entities::Community
22 end 22 end
23 23
test/unit/api/communities_test.rb
  Diff comments   View file @e18f5e9
@@ -7,7 +7,7 @@ class CommunitiesTest < ActiveSupport::TestCase @@ -7,7 +7,7 @@ class CommunitiesTest < ActiveSupport::TestCase
7 end 7 end
8 8
9 should 'list all communities' do 9 should 'list all communities' do
10 - community1 = fast_create(Community) 10 + community1 = fast_create(Community, :public_profile => true)
11 community2 = fast_create(Community) 11 community2 = fast_create(Community)
12 get "/api/v1/communities?#{params.to_query}" 12 get "/api/v1/communities?#{params.to_query}"
13 json = JSON.parse(last_response.body) 13 json = JSON.parse(last_response.body)