diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-23 22:50:48 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-23 22:50:48 -0400 |
commit | 41a93fad32677e3f351c0e16f0c704cbfbc5404e (patch) | |
tree | aa46c550dbd15a1f0bb0faf4e8eebb92c4970bdd /app/models/user.rb | |
parent | 19b04a49d01af1917385c166501ef086eddae437 (diff) | |
parent | 47be7c86ca5193ffe4331fbb9358a9171abe748b (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 138f73e..5c0b5b1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -24,9 +24,13 @@ class User < ActiveRecord::Base end def find_remote_username(game) - obj = remote_username.where(:game => game) - if obj.nil? and not game.parent.nil? - return find_remote_username(game.parent) + obj = self.remote_usernames.where(:game => game).first + if obj.nil? + if game.parent.nil? + return nil + else + return find_remote_username(game.parent) + end else return obj.value end |