Download as
Browse Code »

Commit 360702f59753ba5d57469c60ead1cee3134e4b10

Authored by Weblate
2 parents c1cedff5 174c9bb9
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

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 1 additions and 2 deletions   Show diff stats
lib/acts_as_filesystem.rb
  Diff comments   View file @360702f
@@ -35,8 +35,7 @@ module ActsAsFileSystem @@ -35,8 +35,7 @@ module ActsAsFileSystem
35 def build_ancestry(parent_id = nil, ancestry = '') 35 def build_ancestry(parent_id = nil, ancestry = '')
36 ActiveRecord::Base.transaction do 36 ActiveRecord::Base.transaction do
37 self.base_class.all(:conditions => {:parent_id => parent_id}).each do |node| 37 self.base_class.all(:conditions => {:parent_id => parent_id}).each do |node|
38 - node.ancestry = ancestry  
39 - node.send :create_or_update_without_callbacks 38 + node.update_column :ancestry, ancestry
40 39
41 build_ancestry node.id, (ancestry.empty? ? "#{node.formatted_ancestry_id}" : 40 build_ancestry node.id, (ancestry.empty? ? "#{node.formatted_ancestry_id}" :
42 "#{ancestry}#{node.ancestry_sep}#{node.formatted_ancestry_id}") 41 "#{ancestry}#{node.ancestry_sep}#{node.formatted_ancestry_id}")