summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-28 12:45:38 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-28 12:45:38 +0100
commit25d5c729e37f39799c415dfedf7b1699c328d02f (patch)
treec1e6a3f2575fbfff39c01770ecb9d918d95ca88f /app
parent8dad9594fbcc8c236a350266c4538a92eeae2772 (diff)
parente19843740a9c45c47d6dd65bc337353bb6826d4d (diff)
Merge branch 'fix_validation' into develop
Diffstat (limited to 'app')
-rw-r--r--app/models/phone.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/phone.rb b/app/models/phone.rb
index 9e5766a..1f3c497 100644
--- a/app/models/phone.rb
+++ b/app/models/phone.rb
@@ -33,7 +33,7 @@ class Phone < ActiveRecord::Base
validates_presence_of :phone_model
validates_presence_of :phoneable
- validates_uniqueness_of :fallback_sip_account_id
+ validates_uniqueness_of :fallback_sip_account_id, :allow_nil => true
before_save :save_last_ip_address
before_save :destroy_phones_sip_accounts_if_phoneable_changed