diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-27 11:13:13 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-27 11:13:13 +0100 |
commit | 361a226ac8167b2c6a552960155e89ecb344ec0c (patch) | |
tree | fe9e3f8921749015803f0efcb03169fcc226c333 /app/models | |
parent | f5a09733ae0b6f77211eea03ab161e0c9122465b (diff) | |
parent | 45af07cb093eb0202967cf0d0fc058ca58f0b782 (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/gateway.rb | 2 | ||||
-rw-r--r-- | app/models/gateway_setting.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/gateway.rb b/app/models/gateway.rb index 3e791a6..a8df41f 100644 --- a/app/models/gateway.rb +++ b/app/models/gateway.rb @@ -1,5 +1,5 @@ class Gateway < ActiveRecord::Base - TECHNOLOGIES = ['sip'] + TECHNOLOGIES = ['sip', 'xmpp'] attr_accessible :name, :technology, :inbound, :outbound, :description diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb index c01f0a8..e3eaadb 100644 --- a/app/models/gateway_setting.rb +++ b/app/models/gateway_setting.rb @@ -11,6 +11,16 @@ class GatewaySetting < ActiveRecord::Base 'auth_pattern' => 'String', 'number_source' => 'String', }, + 'xmpp' => { + 'server' => 'String', + 'login' => 'String', + 'password' => 'String', + 'inbound_number' => 'String', + 'auth_source' => 'String', + 'auth_pattern' => 'String', + 'number_source' => 'String', + 'destination_domain' => 'String', + }, } attr_accessible :gateway_id, :name, :value, :class_type, :description |