Merge branch 'release/0.15.0.5'

ulmic · Mar 20, 2017 · ba83d11 · ba83d11
2 parents 474489f + 1a90230
commit ba83d11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -17,7 +17,7 @@ class User < ActiveRecord::Base
   has_many :comments, dependent: :destroy
   has_and_belongs_to_many :teams
   has_many :merits, class_name: 'ActivityLines::Corporative::Merit'
-  has_many :ya_lider_participations, class_name: 'ActivityLines::Lider::YaLider::Participation'
+  has_many :ya_lider_participants, class_name: 'ActivityLines::Lider::YaLider::Participant'
 
   validates :email, email: true,
                     allow_blank: true

diff --git a/bin/data_fixes/user_to_member_fix.rb b/bin/data_fixes/user_to_member_fix.rb
@@ -2,7 +2,7 @@
   user = User.find ENV['USER_ID']
   member = Member.find ENV['MEMBER_ID']
   puts "Updating associations...".green
-  [:authentications, :article, :registrations, :logged_actions, :comments, :ya_lider_participations].each do |association|
+  [:authentications, :article, :registrations, :logged_actions, :comments, :ya_lider_participants].each do |association|
     user.send(association).each do |obj|
       obj.update_attributes! user_id: member.id
     end