Download as
Browse Code »

Commit 31fdbc17f07401adba119f62a15c17c0928429ed

Authored by AntonioTerceiro
1 parent 1846267f
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem93: putting acts_as_versioned again; the problem was that acts_as_file… 

…system was returning false in an ActiveRecord callback



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@944 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
lib/acts_as_filesystem.rb
  Diff comments   View file @31fdbc1
@@ -24,6 +24,7 @@ module ActsAsFileSystem @@ -24,6 +24,7 @@ module ActsAsFileSystem
24 if record.path == record.slug && (! record.top_level?) 24 if record.path == record.slug && (! record.top_level?)
25 record.path = record.calculate_path 25 record.path = record.calculate_path
26 end 26 end
  27 + true
27 end 28 end
28 29
29 # when renaming a category, all children categories must have their paths 30 # when renaming a category, all children categories must have their paths
@@ -37,6 +38,7 @@ module ActsAsFileSystem @@ -37,6 +38,7 @@ module ActsAsFileSystem
37 end 38 end
38 end 39 end
39 record.recalculate_path = false 40 record.recalculate_path = false
  41 + true
40 end 42 end
41 43
42 end 44 end
test/unit/article_test.rb
  Diff comments   View file @31fdbc1
@@ -33,10 +33,10 @@ class ArticleTest < Test::Unit::TestCase @@ -33,10 +33,10 @@ class ArticleTest < Test::Unit::TestCase
33 33
34 should 'act as versioned' do 34 should 'act as versioned' do
35 a = Article.create!(:name => 'my article', :body => 'my text', :profile_id => profile.id) 35 a = Article.create!(:name => 'my article', :body => 'my text', :profile_id => profile.id)
36 - assert_equal 1, a.versions.size 36 + assert_equal 1, a.versions(true).size
37 a.name = 'some other name' 37 a.name = 'some other name'
38 a.save! 38 a.save!
39 - assert_equal 2, a.versions.size 39 + assert_equal 2, a.versions(true).size
40 end 40 end
41 41
42 should 'act as taggable' do 42 should 'act as taggable' do