Whoops.
parent
fe06f09792
commit
24734ae2c1
|
@ -2,16 +2,16 @@
|
|||
# This is useful for caching things like owner info, work logs, etc
|
||||
class Device < ActiveRecord::Base
|
||||
DEFAULT_MAX_LOGS = 50
|
||||
has_many :users
|
||||
has_many :schedules, dependent: :destroy
|
||||
has_many :logs, dependent: :destroy
|
||||
has_many :sequences, dependent: :destroy
|
||||
has_many :regimens, dependent: :destroy
|
||||
has_many :plants, dependent: :destroy
|
||||
has_many :peripherals, dependent: :destroy
|
||||
has_many :tool_bays, dependent: :destroy
|
||||
has_many :tools, dependent: :destroy
|
||||
has_one :planting_area, dependent: :destroy
|
||||
has_many :users
|
||||
has_many :schedules, dependent: :destroy
|
||||
has_many :logs, dependent: :destroy
|
||||
has_many :sequences, dependent: :destroy
|
||||
has_many :regimens, dependent: :destroy
|
||||
has_many :plants, dependent: :destroy
|
||||
has_many :peripherals, dependent: :destroy
|
||||
has_many :tool_bays, dependent: :destroy
|
||||
has_many :tools, dependent: :destroy
|
||||
has_one :planting_area, dependent: :destroy
|
||||
validates :name, uniqueness: true
|
||||
|
||||
def limit_log_length
|
||||
|
|
|
@ -5,6 +5,7 @@ class Log < ActiveRecord::Base
|
|||
serialize :channels
|
||||
belongs_to :device
|
||||
|
||||
validates :device, presence: true
|
||||
# http://stackoverflow.com/a/5127684/1064917
|
||||
before_validation :set_defaults
|
||||
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
class User < ActiveRecord::Base
|
||||
belongs_to :device, dependent: :destroy
|
||||
|
||||
devise :database_authenticatable, :registerable, :recoverable, :rememberable,
|
||||
:trackable, :validatable
|
||||
|
||||
devise :database_authenticatable, :trackable
|
||||
# :registerable, # Remove?
|
||||
# :recoverable, # Remove.
|
||||
# :rememberable, # Remove.
|
||||
# :validatable # Remove?
|
||||
end
|
||||
|
|
|
@ -17,7 +17,7 @@ module Logs
|
|||
|
||||
def validate
|
||||
@log = Log.new(inputs)
|
||||
binding.pry
|
||||
@log.validate!
|
||||
end
|
||||
|
||||
def execute
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
class RemoveLegacyDeviseColumnsFromUserTable < ActiveRecord::Migration[5.0]
|
||||
def change
|
||||
remove_column :users, :reset_password_token, :string
|
||||
remove_column :users, :reset_password_sent_at, :datetime
|
||||
remove_column :users, :remember_created_at, :datetime
|
||||
end
|
||||
end
|
16
db/schema.rb
16
db/schema.rb
|
@ -10,7 +10,7 @@
|
|||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20161206210809) do
|
||||
ActiveRecord::Schema.define(version: 20161207141826) do
|
||||
|
||||
create_table "delayed_jobs", force: :cascade do |t|
|
||||
t.integer "priority", default: 0, null: false
|
||||
|
@ -152,20 +152,16 @@ ActiveRecord::Schema.define(version: 20161206210809) do
|
|||
create_table "users", force: :cascade do |t|
|
||||
t.integer "device_id"
|
||||
t.string "name"
|
||||
t.string "email", default: "", null: false
|
||||
t.string "encrypted_password", default: "", null: false
|
||||
t.string "reset_password_token"
|
||||
t.datetime "reset_password_sent_at"
|
||||
t.datetime "remember_created_at"
|
||||
t.integer "sign_in_count", default: 0, null: false
|
||||
t.string "email", default: "", null: false
|
||||
t.string "encrypted_password", default: "", null: false
|
||||
t.integer "sign_in_count", default: 0, null: false
|
||||
t.datetime "current_sign_in_at"
|
||||
t.datetime "last_sign_in_at"
|
||||
t.string "current_sign_in_ip"
|
||||
t.string "last_sign_in_ip"
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.index ["email"], name: "index_users_on_email", unique: true
|
||||
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue