Merge branch 'settings_backend'

2017-06-01 17:14:57 +06:30
parent ad38a0a708 e200dcd438
commit 926c54c079
15 changed files with 54 additions and 17 deletions
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -2,7 +2,7 @@ class Menu < ApplicationRecord
  has_many :menu_categories, dependent: :destroy

  validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
-  validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i, :on => :create
+  validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
  #Default Scope to pull the active version only
  default_scope { where(is_active: true).order("created_at desc") }