From 409e32a29e183202be31935aaaf6e1f97b30702f Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Sun, 13 Jan 2013 16:33:07 +0000 Subject: gateway settings models added --- app/models/gateway_setting.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/models/gateway_setting.rb (limited to 'app/models/gateway_setting.rb') diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb new file mode 100644 index 0000000..c6c0b9a --- /dev/null +++ b/app/models/gateway_setting.rb @@ -0,0 +1,5 @@ +class GatewaySetting < ActiveRecord::Base + attr_accessible :gateway_id, :name, :value, :class_type, :description + + belongs_to :gateway +end -- cgit v1.2.3 From 86c322181ac1aeed7fa8dde7f7c03b570359917b Mon Sep 17 00:00:00 2001 From: spag Date: Sun, 13 Jan 2013 20:33:32 +0100 Subject: validations --- app/models/gateway_setting.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/models/gateway_setting.rb') diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb index c6c0b9a..bc676a4 100644 --- a/app/models/gateway_setting.rb +++ b/app/models/gateway_setting.rb @@ -2,4 +2,12 @@ class GatewaySetting < ActiveRecord::Base attr_accessible :gateway_id, :name, :value, :class_type, :description belongs_to :gateway + + validates :name, + :presence => true, + :uniqueness => true + + validates :class_type, + :presence => true, + :inclusion => { :in => ['String', 'Integer', 'Boolean'] } end -- cgit v1.2.3 From 57097d16d2a7e86f9e03625fd2fb6796504c32a2 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 13 Jan 2013 22:26:28 +0100 Subject: Bugfixes for gateway stuff. --- app/models/gateway_setting.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/models/gateway_setting.rb') diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb index bc676a4..078901f 100644 --- a/app/models/gateway_setting.rb +++ b/app/models/gateway_setting.rb @@ -5,9 +5,13 @@ class GatewaySetting < ActiveRecord::Base validates :name, :presence => true, - :uniqueness => true + :uniqueness => {:scope => :gateway_id} validates :class_type, :presence => true, :inclusion => { :in => ['String', 'Integer', 'Boolean'] } + + def to_s + name + end end -- cgit v1.2.3 From 4670a33c504f36ddb93cf8ed846c65ceb6810c82 Mon Sep 17 00:00:00 2001 From: spag Date: Mon, 14 Jan 2013 00:13:45 +0100 Subject: gateway_setting views --- app/models/gateway_setting.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/models/gateway_setting.rb') diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb index 078901f..cf1292d 100644 --- a/app/models/gateway_setting.rb +++ b/app/models/gateway_setting.rb @@ -1,4 +1,6 @@ class GatewaySetting < ActiveRecord::Base + CLASS_TYPES = ['String', 'Integer', 'Boolean'] + attr_accessible :gateway_id, :name, :value, :class_type, :description belongs_to :gateway @@ -9,7 +11,7 @@ class GatewaySetting < ActiveRecord::Base validates :class_type, :presence => true, - :inclusion => { :in => ['String', 'Integer', 'Boolean'] } + :inclusion => { :in => CLASS_TYPES } def to_s name -- cgit v1.2.3 From effdf42ddf751d3973b44465168078344a414982 Mon Sep 17 00:00:00 2001 From: spag Date: Mon, 14 Jan 2013 09:47:51 +0100 Subject: available gateway_settings --- app/models/gateway_setting.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/models/gateway_setting.rb') diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb index cf1292d..cb430d1 100644 --- a/app/models/gateway_setting.rb +++ b/app/models/gateway_setting.rb @@ -1,5 +1,8 @@ class GatewaySetting < ActiveRecord::Base CLASS_TYPES = ['String', 'Integer', 'Boolean'] + GATEWAY_SETTINGS = { + 'sip' => { 'domain' => 'String', 'username' => 'String', 'password' => 'String', 'register' => 'Boolean' }, + } attr_accessible :gateway_id, :name, :value, :class_type, :description -- cgit v1.2.3 From d23a161907f64421a6d49b9867859d519188281c Mon Sep 17 00:00:00 2001 From: spag Date: Mon, 14 Jan 2013 17:13:05 +0100 Subject: allow header based authentication for gateways --- app/models/gateway_setting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/gateway_setting.rb') diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb index cb430d1..96410f4 100644 --- a/app/models/gateway_setting.rb +++ b/app/models/gateway_setting.rb @@ -1,7 +1,7 @@ class GatewaySetting < ActiveRecord::Base CLASS_TYPES = ['String', 'Integer', 'Boolean'] GATEWAY_SETTINGS = { - 'sip' => { 'domain' => 'String', 'username' => 'String', 'password' => 'String', 'register' => 'Boolean' }, + 'sip' => { 'domain' => 'String', 'username' => 'String', 'password' => 'String', 'register' => 'Boolean', 'auth_source' => 'String', 'auth_pattern' => 'String' }, } attr_accessible :gateway_id, :name, :value, :class_type, :description -- cgit v1.2.3 From 857f3de83628c1de8d1c65ce2aea36ab7bd8e8c5 Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 15 Jan 2013 12:28:21 +0100 Subject: gateway settings added --- app/models/gateway_setting.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'app/models/gateway_setting.rb') diff --git a/app/models/gateway_setting.rb b/app/models/gateway_setting.rb index 96410f4..c01f0a8 100644 --- a/app/models/gateway_setting.rb +++ b/app/models/gateway_setting.rb @@ -1,7 +1,16 @@ class GatewaySetting < ActiveRecord::Base CLASS_TYPES = ['String', 'Integer', 'Boolean'] GATEWAY_SETTINGS = { - 'sip' => { 'domain' => 'String', 'username' => 'String', 'password' => 'String', 'register' => 'Boolean', 'auth_source' => 'String', 'auth_pattern' => 'String' }, + 'sip' => { + 'domain' => 'String', + 'username' => 'String', + 'password' => 'String', + 'contact' => 'String', + 'register' => 'Boolean', + 'auth_source' => 'String', + 'auth_pattern' => 'String', + 'number_source' => 'String', + }, } attr_accessible :gateway_id, :name, :value, :class_type, :description -- cgit v1.2.3