Commit d1e84958 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add validations to BroadcastMessage color and font

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent e78c51f7
...@@ -20,6 +20,9 @@ class BroadcastMessage < ActiveRecord::Base ...@@ -20,6 +20,9 @@ class BroadcastMessage < ActiveRecord::Base
validates :starts_at, presence: true validates :starts_at, presence: true
validates :ends_at, presence: true validates :ends_at, presence: true
validates :color, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true
validates :font, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true
def self.current def self.current
where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last
end end
......
...@@ -21,11 +21,13 @@ ...@@ -21,11 +21,13 @@
.control-group.js-toggle-colors-container.hide .control-group.js-toggle-colors-container.hide
= f.label :color, "Background Color" = f.label :color, "Background Color"
.controls .controls
= f.text_field :color = f.text_field :color, placeholder: "#AA33EE"
.light Hex values as 3 double digit numbers, starting with a # sign.
.control-group.js-toggle-colors-container.hide .control-group.js-toggle-colors-container.hide
= f.label :font, "Font Color" = f.label :font, "Font Color"
.controls .controls
= f.text_field :font = f.text_field :font, placeholder: "#224466"
.light Hex values as 3 double digit numbers, starting with a # sign.
.control-group .control-group
= f.label :starts_at = f.label :starts_at
.controls.datetime-controls .controls.datetime-controls
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment