Download as
Browse Code »

Commit 89997cec9b5ac0cf6b1adbce5144b052395cc5b4

Authored by Victor Costa
1 parent a997e8fc
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

rails3: fix use of Person.or_scope 

There must be a better way to merge scopes (grouped with OR) in rails3
Showing 2 changed files with 10 additions and 2 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @89997ce
... ... @@ -92,7 +92,15 @@ class Profile < ActiveRecord::Base
92 92 def members
93 93 scopes = plugins.dispatch_scopes(:organization_members, self)
94 94 scopes << Person.members_of(self)
95   - scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
  95 +
  96 + clauses = scopes.map do |relation|
  97 + clause = relation.arel.where_clauses.map { |clause| "(#{clause})" }.join(' AND ')
  98 + "(#{clause})"
  99 + end.join(' OR ')
  100 +
  101 + joins = scopes.map { |relation| relation.joins_values }.flatten.uniq
  102 + selects = scopes.map { |relation| relation.select_values }.flatten.uniq
  103 + Person.select(selects).joins(joins).where(clauses)
96 104 end
97 105  
98 106 def members_count
... ...
test/unit/profile_test.rb
  Diff comments   View file @89997ce
... ... @@ -1807,7 +1807,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
1807 1807 assert_includes original_community.members, original_member
1808 1808 assert_includes original_community.members, plugin1_member
1809 1809 assert_includes original_community.members, plugin2_member
1810   - assert 3, original_community.members.count
  1810 + assert_equal 3, original_community.members.count
1811 1811 end
1812 1812  
1813 1813 private
... ...