Download as
Browse Code »

Commit d1e8495890ed28d221595e3a60c2df8567b277c1

Authored by Dmitriy Zaporozhets
1 parent e78c51f7
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Add validations to BroadcastMessage color and font 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 7 additions and 2 deletions   Show diff stats
app/models/broadcast_message.rb
  Diff comments   View file @d1e8495
@@ -20,6 +20,9 @@ class BroadcastMessage &lt; ActiveRecord::Base @@ -20,6 +20,9 @@ class BroadcastMessage &lt; ActiveRecord::Base
20 validates :starts_at, presence: true 20 validates :starts_at, presence: true
21 validates :ends_at, presence: true 21 validates :ends_at, presence: true
22 22
  23 + validates :color, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true
  24 + validates :font, format: { with: /\A\#[0-9A-Fa-f]{6}+\Z/ }, allow_blank: true
  25 +
23 def self.current 26 def self.current
24 where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last 27 where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last
25 end 28 end
app/views/admin/broadcast_messages/index.html.haml
  Diff comments   View file @d1e8495
@@ -21,11 +21,13 @@ @@ -21,11 +21,13 @@
21 .control-group.js-toggle-colors-container.hide 21 .control-group.js-toggle-colors-container.hide
22 = f.label :color, "Background Color" 22 = f.label :color, "Background Color"
23 .controls 23 .controls
24 - = f.text_field :color 24 + = f.text_field :color, placeholder: "#AA33EE"
  25 + .light Hex values as 3 double digit numbers, starting with a # sign.
25 .control-group.js-toggle-colors-container.hide 26 .control-group.js-toggle-colors-container.hide
26 = f.label :font, "Font Color" 27 = f.label :font, "Font Color"
27 .controls 28 .controls
28 - = f.text_field :font 29 + = f.text_field :font, placeholder: "#224466"
  30 + .light Hex values as 3 double digit numbers, starting with a # sign.
29 .control-group 31 .control-group
30 = f.label :starts_at 32 = f.label :starts_at
31 .controls.datetime-controls 33 .controls.datetime-controls