added gateway technology

5 files changed, 15 insertions, 3 deletions

diff --git a/app/controllers/gateways_controller.rb b/app/controllers/gateways_controller.rb
index 5741195..d3362e0 100644
--- a/app/controllers/gateways_controller.rb
+++ b/app/controllers/gateways_controller.rb
@@ -13,6 +13,7 @@ class GatewaysController < ApplicationController
 
   def new
     @gateway = Gateway.new
+    @technologies = Gateway::TECHNOLOGIES
     spread_breadcrumbs
   end
 
@@ -28,6 +29,7 @@ class GatewaysController < ApplicationController
 
   def edit
     @gateway = Gateway.find(params[:id])
+    @technologies = Gateway::TECHNOLOGIES
     spread_breadcrumbs
   end
 
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
diff --git a/app/views/gateway_settings/_form_core.html.haml b/app/views/gateway_settings/_form_core.html.haml
index 3e7dc49..229009b 100644
--- a/app/views/gateway_settings/_form_core.html.haml
+++ b/app/views/gateway_settings/_form_core.html.haml
@@ -1,4 +1,4 @@
 .inputs
-  = f.input :name, :collection => GatewaySetting::GATEWAY_SETTINGS['sip'].keys, :label => t('gateway_settings.form.name.label'), :hint => conditional_hint('gateway_settings.form.name.hint'), :autofocus => true, :include_blank => false
+  = f.input :name, :collection => GatewaySetting::GATEWAY_SETTINGS[@gateway.technology].keys, :label => t('gateway_settings.form.name.label'), :hint => conditional_hint('gateway_settings.form.name.hint'), :autofocus => true, :include_blank => false
   = f.input :value, :label => t('gateway_settings.form.value.label'), :hint => conditional_hint('gateway_settings.form.value.hint')
   = f.input :description, :label => t('gateway_settings.form.description.label'), :hint => conditional_hint('gateway_settings.form.description.hint')
diff --git a/app/views/gateways/_form_core.html.haml b/app/views/gateways/_form_core.html.haml
index 13ed8b1..604c223 100644
--- a/app/views/gateways/_form_core.html.haml
+++ b/app/views/gateways/_form_core.html.haml
@@ -1,6 +1,6 @@
 .inputs
   = f.input :name, :label => t('gateways.form.name.label'), :hint => conditional_hint('gateways.form.name.hint'), :autofocus => true
-  = f.input :technology, :label => t('gateways.form.technology.label'), :hint => conditional_hint('gateways.form.technology.hint')
+  = f.input :technology, :collection => @technologies, :label => t('gateways.form.technology.label'), :hint => conditional_hint('gateways.form.technology.hint'), :include_blank => false
   = f.input :inbound, :label => t('gateways.form.inbound.label'), :hint => conditional_hint('gateways.form.inbound.hint')
   = f.input :outbound, :label => t('gateways.form.outbound.label'), :hint => conditional_hint('gateways.form.outbound.hint')
   = f.input :description, :label => t('gateways.form.description.label'), :hint => conditional_hint('gateways.form.description.hint')