diff options
author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-02-13 05:39:43 -0600 |
---|---|---|
committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-02-13 05:39:43 -0600 |
commit | c2aad881ff34ce544b24847279472448917f38e1 (patch) | |
tree | 4b42aa65165f9adcc8e113a20cd141866cb09758 /app/models/sip_account.rb | |
parent | 791bf973b02b626f876b7e5819e2037dcff90f84 (diff) | |
parent | 1776a5b243aa7b62eff09319e2f766426307e220 (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models/sip_account.rb')
-rw-r--r-- | app/models/sip_account.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb index 9ba1f8b..7df8e3b 100644 --- a/app/models/sip_account.rb +++ b/app/models/sip_account.rb @@ -6,7 +6,7 @@ class SipAccount < ActiveRecord::Base attr_accessible :auth_name, :caller_name, :password, :voicemail_pin, :tenant_id, :call_waiting, :clir, :clip_no_screening, :clip, :description, :callforward_rules_act_per_sip_account, - :hotdeskable, :gs_node_id + :hotdeskable, :gs_node_id, :language_code # Associations: # @@ -31,6 +31,8 @@ class SipAccount < ActiveRecord::Base belongs_to :gs_node + belongs_to :language, :foreign_key => 'language_code', :primary_key => 'code' + # Delegations: # delegate :host, :to => :sip_domain, :allow_nil => true |