modify app_id generator

This commit is contained in:
Zin Moe
2020-01-27 18:17:13 +06:30
parent b585172ce3
commit 0ea212bf65
3 changed files with 16 additions and 17 deletions

View File

@@ -41,7 +41,7 @@ class Settings::EmployeesController < ApplicationController
end
def change_app_token
@employee.app_token = @employee.generate_app_token #SecureRandom.hex(10)
@employee.app_token = @employee.generate_app_token
@employee.save
flash[:notice] = 'Auth Token was successfully updated.'
redirect_to settings_employee_url(@employee)

View File

@@ -12,7 +12,7 @@ class Employee < ApplicationRecord
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
before_create :generate_app_id, :generate_app_token , if: Proc.new { self.role == "application" }
before_save :generate_app_id, :generate_app_token , if: Proc.new { self.role == "application" }
# Employee Image Uploader
mount_uploader :image_path, EmployeeImageUploader
@@ -90,15 +90,14 @@ class Employee < ApplicationRecord
end
def generate_app_id
# return if self.role != 'application'
self.app_id = SecureRandom.urlsafe_base64(nil, false)
return if self.app_id.present?
self.app_id = SecureRandom.hex(8)
rescue ActiveRecord::RecordNotUnique
retry
end
def generate_app_token
# return if self.role != 'application'
self.app_token = SecureRandom.hex(10)
self.app_token = SecureRandom.hex(8)
rescue ActiveRecord::RecordNotUnique
retry
end

View File

@@ -42,17 +42,17 @@ class Printer::PrinterWorker
end
def print(file_path, printer_destination = nil )
# if printer_destination.nil?
# printer_destination = self.printer_destination
# end
if printer_destination.nil?
printer_destination = self.printer_destination
end
# copy = self.print_copies
# #Print only when printer information is not null
# if !self.printer_destination.nil?
# (1..copy).each do
# page = Cups::PrintJob.new(file_path, printer_destination)
# page.print
# end
# end
copy = self.print_copies
#Print only when printer information is not null
if !self.printer_destination.nil?
(1..copy).each do
page = Cups::PrintJob.new(file_path, printer_destination)
page.print
end
end
end
end