Download as
Browse Code »

Commit 5f0d0a34bcd3e0d2ee7dc0afa42738d56b4e8dd4

Authored by Antonio Terceiro
1 parent 6a7965a4
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 list regions with validators multiple times 

(ActionItem1482)
Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
app/models/region.rb
  Diff comments   View file @5f0d0a3
@@ -16,7 +16,7 @@ class Region < Category @@ -16,7 +16,7 @@ class Region < Category
16 end 16 end
17 17
18 def self.with_validators 18 def self.with_validators
19 - Region.find(:all, :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)') 19 + Region.find(:all, :joins => 'INNER JOIN region_validators on (region_validators.region_id = categories.id)', :select => "distinct #{table_name}.*")
20 end 20 end
21 21
22 end 22 end
test/unit/region_test.rb
  Diff comments   View file @5f0d0a3
@@ -55,13 +55,18 @@ class RegionTest < Test::Unit::TestCase @@ -55,13 +55,18 @@ class RegionTest < Test::Unit::TestCase
55 55
56 should 'list regions with validators' do 56 should 'list regions with validators' do
57 bahia = fast_create(Region, :name => 'Bahia') 57 bahia = fast_create(Region, :name => 'Bahia')
58 - forum_ecosol_ba = fast_create(Enterprise, :name => 'Forum Baiano de Economia Solidaria', :identifier => 'ecosol-ba')  
59 - bahia.validators << forum_ecosol_ba 58 + bahia.validators << fast_create(Enterprise, :name => 'Forum Baiano de Economia Solidaria', :identifier => 'ecosol-ba')
60 59
61 sergipe = fast_create(Region, :name => 'Sergipe') 60 sergipe = fast_create(Region, :name => 'Sergipe')
62 # Sergipe has no validators 61 # Sergipe has no validators
63 62
64 - assert_equivalent Region.with_validators, [bahia] 63 + assert_equivalent [bahia], Region.with_validators
  64 + end
  65 +
  66 + should 'list each region with validatores only once' do
  67 + bahia = fast_create(Region, :name => 'Bahia')
  68 + 2.times { |i| bahia.validators << fast_create(Enterprise, :name => "validator #{i}", :identifier => "validator-#{i}")}
  69 + assert_equal [bahia], Region.with_validators
65 end 70 end
66 71
67 end 72 end