From 2de697bcca063f855683a5b8dcddf77c69bf9e97 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 21 Nov 2014 17:24:08 -0500 Subject: [PATCH] ensured that new users can sign up with other new users invite codes --- app/models/user.rb | 9 +++------ config/initializers/access_codes.rb | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 config/initializers/access_codes.rb diff --git a/app/models/user.rb b/app/models/user.rb index 3dea654b..8596a771 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -28,12 +28,7 @@ class User < ActiveRecord::Base validates_uniqueness_of :name # done by devise validates_uniqueness_of :email # done by devise - if ActiveRecord::Base.connection.table_exists? 'users' - codes = ActiveRecord::Base.connection.execute("SELECT code FROM users").map {|user| user["code"] } - else - codes = [] - end - validates :joinedwithcode, :presence => true, :inclusion => { :in => codes, :message => "%{value} is not valid" }, :on => :create + validates :joinedwithcode, :presence => true, :inclusion => { :in => $codes, :message => "%{value} is not valid" }, :on => :create # This method associates the attribute ":image" with a file attachment has_attached_file :image, :styles => { @@ -55,6 +50,8 @@ class User < ActiveRecord::Base #generate a random 8 letter/digit code that they can use to invite people self.code = rand(36**8).to_s(36) + $codes.push(self.code) + self.generation = self.get_generation end diff --git a/config/initializers/access_codes.rb b/config/initializers/access_codes.rb new file mode 100644 index 00000000..adb4ae8b --- /dev/null +++ b/config/initializers/access_codes.rb @@ -0,0 +1,4 @@ + $codes = [] + if ActiveRecord::Base.connection.table_exists? 'users' + $codes = ActiveRecord::Base.connection.execute("SELECT code FROM users").map {|user| user["code"] } + end \ No newline at end of file