glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/rspec-tests

Browse source
This commit is contained in:
Devin Howard 2015-12-15 22:12:30 +08:00
commit 229b7d2cc5
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/user.rb
View file

@ -7,7 +7,7 @@ class User < ActiveRecord::Base
has_many :maps has_many :maps
has_many :mappings has_many :mappings
before_create :generate_code after_create :generate_code
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable
@ -66,15 +66,10 @@ class User < ActiveRecord::Base
def generate_code def generate_code
self.code = rand(36**8).to_s(36) self.code = rand(36**8).to_s(36)
$codes.push(self.code) $codes.push(self.code)
self.generation = self.get_generation self.generation = get_generation!
end end
def get_generation def get_generation!
calculate_generation() if generation.nil?
generation
end
def calculate_generation
if code == joinedwithcode if code == joinedwithcode
update(generation: 0) update(generation: 0)
else else