northwhale/site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continue to backport old code

Browse Source
This commit is contained in:
Etienne Ischer
2021-04-24 00:24:05 +02:00
parent 5d7217f355
commit 04434760c5
72 changed files with 795 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user.rb
View File

@@ -8,6 +8,10 @@ class User < ApplicationRecord
devise :rememberable, :omniauthable, omniauth_providers: [:bnet]
has_many :wow_characters, dependent: :destroy
has_many :user_obtain_wow_mounts, dependent: :destroy
has_many :wow_mounts, through: :user_obtain_wow_mounts
has_many :user_obtain_wow_pets, dependent: :destroy
has_many :wow_pets, through: :user_obtain_wow_pets
validates :battletag, presence: true, uniqueness: true
@@ -28,8 +32,8 @@ class User < ApplicationRecord
def self.new_with_session(params, session)
super.tap do |user|
if (data = session['devise.bnet_data']) && session['devise.bnet_data']['extra']['raw_info']
user.email = data['email'] if user.email.blank?
if (data = session['devise.bnet_data']) && session['devise.bnet_data']['extra']['raw_info'] && user.email.blank?
user.email = data['email']
end
end
end