Update to new rails validators
parent
a99d0c9ff4
commit
8f94f1b625
|
@ -10,5 +10,5 @@ class Device < ActiveRecord::Base
|
|||
has_many :tool_bays, dependent: :destroy
|
||||
has_one :planting_area, dependent: :destroy
|
||||
|
||||
validates_uniqueness_of :name
|
||||
validates :name, uniqueness: true
|
||||
end
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
class Peripheral < ActiveRecord::Base
|
||||
belongs_to :device
|
||||
validates_presence_of :device
|
||||
validates_presence_of :pin
|
||||
validates_uniqueness_of :pin, scope: :device
|
||||
validates_inclusion_of :mode, in: Sequence::ALLOWED_PIN_MODES
|
||||
validates_presence_of :label
|
||||
validates :device, presence: true
|
||||
validates :pin, presence: true
|
||||
validates :pin, uniqueness: { scope: :device }
|
||||
validates :mode, inclusion: { in: Sequence::ALLOWED_PIN_MODES }
|
||||
validates :label, presence: true
|
||||
end
|
||||
|
|
|
@ -3,8 +3,8 @@ class Regimen < ActiveRecord::Base
|
|||
# Ocasionally to "regimans".
|
||||
# This is the workaround.
|
||||
self.table_name = "regimens"
|
||||
validates_presence_of :name
|
||||
validates_uniqueness_of :name, scope: :device
|
||||
validates :name, presence: true
|
||||
validates :name, uniqueness: { scope: :device }
|
||||
|
||||
has_many :regimen_items, dependent: :destroy
|
||||
belongs_to :device
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
class RegimenItem < ActiveRecord::Base
|
||||
belongs_to :regimen
|
||||
belongs_to :sequence
|
||||
validates_presence_of :sequence
|
||||
validates :sequence, presence: true
|
||||
end
|
||||
|
|
|
@ -3,9 +3,9 @@ class Schedule < ActiveRecord::Base
|
|||
UNITS_OF_TIME = %w(minutely hourly daily weekly monthly yearly)
|
||||
|
||||
belongs_to :sequence
|
||||
validates_presence_of :sequence_id
|
||||
validates :sequence_id, presence: true
|
||||
belongs_to :device
|
||||
validates_presence_of :device_id
|
||||
validates :device_id, presence: true
|
||||
|
||||
def schedule_rules
|
||||
@schedule_rules ||= IceCube::Schedule.new(start_time, end_time: end_time) do |sch|
|
||||
|
|
|
@ -9,8 +9,8 @@ class Sequence < ActiveRecord::Base
|
|||
|
||||
# allowable label colors for the frontend.
|
||||
[ :name, :kind ].each { |n| validates n, presence: true }
|
||||
validates_inclusion_of :color, in: COLORS
|
||||
validates_uniqueness_of :name, scope: :device
|
||||
validates :color, inclusion: { in: COLORS }
|
||||
validates :name, uniqueness: { scope: :device }
|
||||
STEPS = [ :var_set, :var_get, :move_absolute, :move_relative, :write_pin,
|
||||
:read_pin, :wait, :send_message, :execute, :if_statement]
|
||||
ALLOWED_CHANNEL_NAMES = [ "ticker", "error_ticker",
|
||||
|
|
Loading…
Reference in New Issue