Merge branch 'emberjs' into develop

1 files changed, 22 insertions, 0 deletions

diff --git a/app/models/switchboard.rb b/app/models/switchboard.rb
index 74e2767..53f69a4 100644
--- a/app/models/switchboard.rb
+++ b/app/models/switchboard.rb
@@ -6,11 +6,33 @@ class Switchboard < ActiveRecord::Base
             :presence => true,
             :uniqueness => {:scope => :user_id}
 
+  validates :reload_interval,
+            :numericality => { :only_integer => true, 
+                               :greater_than => 249,
+                               :allow_nil => true 
+                             }
+
+  validates :entry_width,
+            :numericality => { :only_integer => true, 
+                               :greater_than => 0,
+                               :less_than => 5
+                             }
+
   belongs_to :user, :touch => true
   has_many :switchboard_entries, :dependent => :destroy
   has_many :sip_accounts, :through => :switchboard_entries
+  has_many :phone_numbers, :through => :sip_accounts
+
+  before_validation :convert_0_to_nil
 
   def to_s
     self.name.to_s
   end
+
+  private
+  def convert_0_to_nil
+    if self.reload_interval == 0
+      self.reload_interval = nil
+    end
+  end
 end