Download as
Browse Code »

Commit a418a384ae17cf3c680f3789a0ab4b2c5edf4322

Authored by Rafael Martins
1 parent 096b2932
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

Fixed category reloading in articles 

* Removed wrong puts in ProductTest
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @a418a38
... ... @@ -109,10 +109,9 @@ class Article < ActiveRecord::Base
109 109 pending_categorizations << c
110 110 else
111 111 ArticleCategorization.add_category_to_article(c, self)
112   - self.categories(true)
  112 + self.categories(reload)
113 113 self.solr_save
114 114 end
115   - self.categories(reload)
116 115 end
117 116  
118 117 def category_ids=(ids)
... ... @@ -128,6 +127,8 @@ class Article &lt; ActiveRecord::Base
128 127 pending_categorizations.each do |item|
129 128 ArticleCategorization.add_category_to_article(item, self)
130 129 end
  130 + self.categories(true)
  131 + self.solr_save
131 132 pending_categorizations.clear
132 133 end
133 134  
... ...
test/unit/product_test.rb
  Diff comments   View file @a418a38
... ... @@ -520,7 +520,6 @@ class ProductTest &lt; ActiveSupport::TestCase
520 520  
521 521 should 'return solidarity percentage from inputs' do
522 522 prod = fast_create(Product, :name => 'test product1', :product_category_id => @product_category.id, :enterprise_id => @profile.id)
523   - puts "$$$$ #{prod.percentage_from_solidarity_economy}"
524 523 assert_equal 0, prod.percentage_from_solidarity_economy.first
525 524  
526 525 Input.create!(:product_id => prod.id, :product_category_id => @product_category.id,
... ...