Download as
Browse Code »

Commit 5413c05611950cc63e390fb314fb5d6a637f0810

Authored by AntonioTerceiro
1 parent df8735d7
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

ActionItem514: there are other types of regions 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2207 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/models/profile_categorization.rb
  Diff comments   View file @5413c05
@@ -13,7 +13,7 @@ class ProfileCategorization < ActiveRecord::Base @@ -13,7 +13,7 @@ class ProfileCategorization < ActiveRecord::Base
13 end 13 end
14 14
15 def self.remove_region(profile) 15 def self.remove_region(profile)
16 - region = profile.categories.find(:first, :conditions => "type = 'Region'") 16 + region = profile.categories.find(:first, :conditions => { :type => [Region, State, City].map(&:name) })
17 if region 17 if region
18 ids = region.hierarchy.map(&:id) 18 ids = region.hierarchy.map(&:id)
19 self.delete_all(:profile_id => profile.id, :category_id => ids) 19 self.delete_all(:profile_id => profile.id, :category_id => ids)
test/unit/profile_categorization_test.rb
  Diff comments   View file @5413c05
@@ -53,4 +53,17 @@ class ProfileCategorizationTest < ActiveSupport::TestCase @@ -53,4 +53,17 @@ class ProfileCategorizationTest < ActiveSupport::TestCase
53 end 53 end
54 end 54 end
55 55
  56 + [ Region, State, City ].each do |klass|
  57 + should "be able to remove #{klass.name} from profile" do
  58 + region = klass.create!(:name => 'my region', :environment => Environment.default)
  59 + p = create_user('testuser').person
  60 + p.region = region
  61 + p.save!
  62 +
  63 + ProfileCategorization.remove_region(p)
  64 +
  65 + assert_equal [], p.categories(true)
  66 + end
  67 + end
  68 +
56 end 69 end