diff options
| author | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
| commit | 5cf46b6467679ea0367cc0c00787f6f1c86560e4 (patch) | |
| tree | b3f314d1ba574e328f1ce5a27aeadb6ae32980d5 /app/models/phone.rb | |
| parent | 929e7a391f139ed827e9bd3bea339789a82de6d4 (diff) | |
| parent | 8d20201910b1915cffa495e6474d50f9c8e8331d (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models/phone.rb')
| -rw-r--r-- | app/models/phone.rb | 2 |
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 |