Download as
Browse Code »

Commit e7ce66b23b1bb0228b5940247f47ef1a306f509d

Authored by MoisesMachado
1 parent cf5a660f
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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