Merge 89537a8b93 into c34991db44

2014-07-04 19:37:48 +00:00 · 2014-07-04 19:37:48 +00:00 · d69ce3cecd
commit d69ce3cecd
parent c34991db44 89537a8b93
1 changed files with 15 additions and 13 deletions
--- a/db/migrate/20140610165551_migrate_data_person_to_user.rb
+++ b/db/migrate/20140610165551_migrate_data_person_to_user.rb
@ -9,7 +9,8 @@ class MigrateDataPersonToUser < ActiveRecord::Migration

  def change
    TempPerson.all.each do |p|
-      user = TempUser.find(p.user_id)
+      user = TempUser.where('id = ?', p.user_id).first
+      unless user.nil?
        if p.public_name.empty?
          user.name = p.email
        else
@ -25,4 +26,5 @@ class MigrateDataPersonToUser < ActiveRecord::Migration
        user.save!
      end
    end
+  end
 end