diff options
| author | spag <spag@golwen.net> | 2013-02-04 13:11:10 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-02-04 13:11:10 +0100 |
| commit | 48e32b241d422a676b3e977dd1af3688f7ebe63d (patch) | |
| tree | eb658714cdfd4f46fb805e770c3a0bc975014ee6 /app/models | |
| parent | 242470bdb4fa67780e7467c6889b7869dff05d1c (diff) | |
| parent | 049b3e62c2ad3e0affac17214baa38afb994b6ba (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/sip_account.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb index 444eb12..9ba1f8b 100644 --- a/app/models/sip_account.rb +++ b/app/models/sip_account.rb @@ -21,7 +21,7 @@ class SipAccount < ActiveRecord::Base belongs_to :tenant belongs_to :sip_domain - has_many :softkeys, :dependent => :destroy + has_many :softkeys, :dependent => :destroy, :order => :position has_many :voicemail_messages, :foreign_key => 'username', :primary_key => 'auth_name' |