From 692fb99e51a5771028129e6ff5e22f98ed2f97b9 Mon Sep 17 00:00:00 2001 From: Joseph Mastey Date: Thu, 19 Jan 2017 13:55:03 -0600 Subject: [PATCH] upgrade(rails 5): add application record --- app/models/analytics.rb | 2 +- app/models/application_record.rb | 3 +++ app/models/benefits.rb | 2 +- app/models/key_management.rb | 2 +- app/models/message.rb | 2 +- app/models/paid_time_off.rb | 2 +- app/models/pay.rb | 2 +- app/models/performance.rb | 2 +- app/models/retirement.rb | 2 +- app/models/schedule.rb | 2 +- app/models/user.rb | 2 +- app/models/work_info.rb | 2 +- 12 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 app/models/application_record.rb diff --git a/app/models/analytics.rb b/app/models/analytics.rb index d84e777..cb33f7b 100644 --- a/app/models/analytics.rb +++ b/app/models/analytics.rb @@ -1,4 +1,4 @@ -class Analytics < ActiveRecord::Base +class Analytics < ApplicationRecord scope :hits_by_ip, ->(ip,col="*") { select("#{col}").where(:ip_address => ip).order("id DESC")} def self.count_by_col(col) diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000..10a4cba --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/benefits.rb b/app/models/benefits.rb index 0d9caa9..10a38fd 100644 --- a/app/models/benefits.rb +++ b/app/models/benefits.rb @@ -1,4 +1,4 @@ -class Benefits < ActiveRecord::Base +class Benefits < ApplicationRecord def self.save(file, backup=false) data_path = Rails.root.join("public", "data") diff --git a/app/models/key_management.rb b/app/models/key_management.rb index 7188efa..054d335 100644 --- a/app/models/key_management.rb +++ b/app/models/key_management.rb @@ -1,4 +1,4 @@ -class KeyManagement < ActiveRecord::Base +class KeyManagement < ApplicationRecord belongs_to :work_info belongs_to :user end diff --git a/app/models/message.rb b/app/models/message.rb index 7de4c26..07dc5fd 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -1,4 +1,4 @@ -class Message < ActiveRecord::Base +class Message < ApplicationRecord belongs_to :user validates_presence_of :creator_id, :receiver_id, :message diff --git a/app/models/paid_time_off.rb b/app/models/paid_time_off.rb index c398f77..d576733 100644 --- a/app/models/paid_time_off.rb +++ b/app/models/paid_time_off.rb @@ -1,4 +1,4 @@ -class PaidTimeOff < ActiveRecord::Base +class PaidTimeOff < ApplicationRecord belongs_to :user has_many :schedule, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy diff --git a/app/models/pay.rb b/app/models/pay.rb index 7a35563..a2447db 100644 --- a/app/models/pay.rb +++ b/app/models/pay.rb @@ -1,4 +1,4 @@ -class Pay < ActiveRecord::Base +class Pay < ApplicationRecord # Associations belongs_to :user diff --git a/app/models/performance.rb b/app/models/performance.rb index 5dfad88..fe746db 100644 --- a/app/models/performance.rb +++ b/app/models/performance.rb @@ -1,4 +1,4 @@ -class Performance < ActiveRecord::Base +class Performance < ApplicationRecord belongs_to :user def reviewer_name diff --git a/app/models/retirement.rb b/app/models/retirement.rb index c3c981c..e1d7d19 100644 --- a/app/models/retirement.rb +++ b/app/models/retirement.rb @@ -1,3 +1,3 @@ -class Retirement < ActiveRecord::Base +class Retirement < ApplicationRecord belongs_to :user end diff --git a/app/models/schedule.rb b/app/models/schedule.rb index 6692c27..65bff12 100644 --- a/app/models/schedule.rb +++ b/app/models/schedule.rb @@ -1,4 +1,4 @@ -class Schedule < ActiveRecord::Base +class Schedule < ApplicationRecord belongs_to :paid_time_off validates_presence_of :date_begin, :date_end, :event_desc, :event_name, :event_type diff --git a/app/models/user.rb b/app/models/user.rb index 91bf8a5..38eeb2e 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ require 'encryption' -class User < ActiveRecord::Base +class User < ApplicationRecord validates :password, :presence => true, :confirmation => true, :length => {:within => 6..40}, diff --git a/app/models/work_info.rb b/app/models/work_info.rb index 9484803..ce098ce 100644 --- a/app/models/work_info.rb +++ b/app/models/work_info.rb @@ -1,4 +1,4 @@ -class WorkInfo < ActiveRecord::Base +class WorkInfo < ApplicationRecord belongs_to :user has_one :key_management, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy #before_save :encrypt_ssn