Download as
Browse Code »

Commit 9b404dbe5d0a8cf64aef97cc05f24a77e6828280

Authored by Braulio Bhavamitra
1 parent c9e6851d
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, 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, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: disable autosave on person association

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @9b404db
@@ -293,8 +293,7 @@ class Person < Profile @@ -293,8 +293,7 @@ class Person < Profile
293 end 293 end
294 294
295 after_update do |person| 295 after_update do |person|
296 - # FIXME: causes infinite loop with rails4  
297 - #person.user.save! 296 + person.user.save!
298 end 297 end
299 298
300 def is_admin?(environment = nil) 299 def is_admin?(environment = nil)
app/models/user.rb
  Diff comments   View file @9b404db
@@ -85,7 +85,8 @@ class User < ActiveRecord::Base @@ -85,7 +85,8 @@ class User < ActiveRecord::Base
85 end 85 end
86 end 86 end
87 87
88 - has_one :person, :dependent => :destroy 88 + # set autosave to false as we do manually when needed and Person syncs with us
  89 + has_one :person, dependent: :destroy, autosave: false
89 belongs_to :environment 90 belongs_to :environment
90 91
91 attr_protected :activated_at 92 attr_protected :activated_at