From 74bcc8321e5c9eb2f84306d1688ead35f3c86579 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 4 Jun 2014 11:04:36 +0300 Subject: Allow set broadcast color with 3 digits like #444 Signed-off-by: Dmitriy Zaporozhets --- app/models/broadcast_message.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb index 85ab7ed6ae8..ce8b7973cd9 100644 --- a/app/models/broadcast_message.rb +++ b/app/models/broadcast_message.rb @@ -20,8 +20,8 @@ class BroadcastMessage < ActiveRecord::Base validates :starts_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 + validates :color, format: { with: /\A\#[0-9A-Fa-f]{3}{1,2}+\Z/ }, allow_blank: true + validates :font, format: { with: /\A\#[0-9A-Fa-f]{3}{1,2}+\Z/ }, allow_blank: true def self.current where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last -- cgit v1.2.1