Download as
Browse Code »

Commit e7ce66b23b1bb0228b5940247f47ef1a306f509d

Authored by MoisesMachado
1 parent cf5a660f
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

ActionItem501: fixed the duplication of categorization in hierachies 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2201 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 20 additions and 5 deletions   Show diff stats
app/models/categorization.rb
  Diff comments   View file @e7ce66b
1 module Categorization 1 module Categorization
2 2
3 def add_category_to_object(category, object) 3 def add_category_to_object(category, object)
4 - connection.execute("insert into #{table_name} (category_id, #{object_id_column}) values(#{category.id}, #{object.id})") 4 + if !find(:first, :conditions => {object_id_column => object, :category_id => category} )
  5 + connection.execute("insert into #{table_name} (category_id, #{object_id_column}) values(#{category.id}, #{object.id})")
5 6
6 - c = category.parent  
7 - while !c.nil? && !self.find(:first, :conditions => {object_id_column => object, :category_id => c})  
8 - connection.execute("insert into #{table_name} (category_id, #{object_id_column}, virtual) values(#{c.id}, #{object.id}, 1>0)")  
9 - c = c.parent 7 + c = category.parent
  8 + while !c.nil? && !self.find(:first, :conditions => {object_id_column => object, :category_id => c})
  9 + connection.execute("insert into #{table_name} (category_id, #{object_id_column}, virtual) values(#{c.id}, #{object.id}, 1>0)")
  10 + c = c.parent
  11 + end
10 end 12 end
11 end 13 end
12 14
test/unit/article_categorization_test.rb
  Diff comments   View file @e7ce66b
@@ -61,4 +61,17 @@ class ArticleCategorizationTest < Test::Unit::TestCase @@ -61,4 +61,17 @@ class ArticleCategorizationTest < Test::Unit::TestCase
61 end 61 end
62 end 62 end
63 63
  64 + should 'not duplicate when adding the parent of a category by witch the article is already categorized' do
  65 + c1 = Category.create!(:name => 'c1', :environment => Environment.default)
  66 + c2 = c1.children.create!(:name => 'c2', :environment => Environment.default)
  67 +
  68 + p = create_user('testuser').person
  69 + a = p.articles.create!(:name => 'test')
  70 +
  71 + assert_difference ArticleCategorization, :count, 2 do
  72 + ArticleCategorization.add_category_to_article(c2, a)
  73 + ArticleCategorization.add_category_to_article(c1, a)
  74 + end
  75 + end
  76 +
64 end 77 end