git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-01-29 16:27:58 +06:30
parent 8abbf7f1d4 05f71de9f9
commit be65bcb876
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/employee.rb
View File

@@ -12,7 +12,11 @@ class Employee < ApplicationRecord
validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true
validates :password, numericality: true, length: {in: 3..9}, allow_blank: true validates :password, numericality: true, length: {in: 3..9}, allow_blank: true
before_save :generate_app_id, :generate_app_token , if: Proc.new { self.role == "application" } before_create :generate_app_id, :generate_app_token,
if: Proc.new { self.role == "application" }
before_update :generate_app_id, :generate_app_token,
if: Proc.new { self.role == "application" && self.role_was != "application" }
# Employee Image Uploader # Employee Image Uploader
mount_uploader :image_path, EmployeeImageUploader mount_uploader :image_path, EmployeeImageUploader
@@ -90,14 +94,13 @@ class Employee < ApplicationRecord
end end
def generate_app_id def generate_app_id
return if self.app_id.present?
self.app_id = SecureRandom.hex(8) self.app_id = SecureRandom.hex(8)
rescue ActiveRecord::RecordNotUnique rescue ActiveRecord::RecordNotUnique
retry retry
end end
def generate_app_token def generate_app_token
self.app_token = SecureRandom.hex(8) self.app_token = SecureRandom.hex(10)
rescue ActiveRecord::RecordNotUnique rescue ActiveRecord::RecordNotUnique
retry retry
end end