From 8c83a89c6fbfdb31cae8ea6fcf2fd50c12c076a5 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 16 Jan 2013 08:37:56 -0500 Subject: route_elements added --- app/models/route_element.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/models/route_element.rb (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb new file mode 100644 index 0000000..e845f24 --- /dev/null +++ b/app/models/route_element.rb @@ -0,0 +1,5 @@ +class RouteElement < ActiveRecord::Base + attr_accessible :call_route_id, :var_in, :var_out, :pattern, :replacement, :action, :mandatory, :position + + belongs_to :call_route +end -- cgit v1.2.3 From 0ee17f52f8ad337c1240b4c55dbd8f6c6c74dc90 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 16:32:59 +0100 Subject: Fixed routes and breadcrumbs. #106 --- app/models/route_element.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb index e845f24..11bb54a 100644 --- a/app/models/route_element.rb +++ b/app/models/route_element.rb @@ -2,4 +2,9 @@ class RouteElement < ActiveRecord::Base attr_accessible :call_route_id, :var_in, :var_out, :pattern, :replacement, :action, :mandatory, :position belongs_to :call_route + + def to_s + "#{var_in} #{var_out}" + end + end -- cgit v1.2.3 From a8a0c40dfae8844162bd472faa9badc38d30d2d5 Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 16 Jan 2013 23:08:08 +0100 Subject: acts_as_list --- app/models/route_element.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb index 11bb54a..6f6fd3f 100644 --- a/app/models/route_element.rb +++ b/app/models/route_element.rb @@ -3,6 +3,8 @@ class RouteElement < ActiveRecord::Base belongs_to :call_route + acts_as_list :scope => :call_route + def to_s "#{var_in} #{var_out}" end -- cgit v1.2.3 From 85d8dc12c3963f78ea1db4089c6ff2fa6ec205e9 Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 17 Jan 2013 07:44:01 +0100 Subject: validations --- app/models/route_element.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb index 6f6fd3f..d3302ea 100644 --- a/app/models/route_element.rb +++ b/app/models/route_element.rb @@ -1,10 +1,23 @@ class RouteElement < ActiveRecord::Base + ELEMENT_ACTIONS = ['match', 'not_match', 'set_route_var', 'set_header'] + attr_accessible :call_route_id, :var_in, :var_out, :pattern, :replacement, :action, :mandatory, :position belongs_to :call_route acts_as_list :scope => :call_route + validates :var_in, + :presence => true + + validates :pattern, + :presence => true + + validates :action, + :presence => true, + :inclusion => { :in => ELEMENT_ACTIONS } + + def to_s "#{var_in} #{var_out}" end -- cgit v1.2.3 From b086515a8a82f572e204bac9cb8c139ca8a0960d Mon Sep 17 00:00:00 2001 From: spag Date: Thu, 17 Jan 2013 15:11:48 +0100 Subject: element actions --- app/models/route_element.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb index d3302ea..32f730d 100644 --- a/app/models/route_element.rb +++ b/app/models/route_element.rb @@ -1,5 +1,5 @@ class RouteElement < ActiveRecord::Base - ELEMENT_ACTIONS = ['match', 'not_match', 'set_route_var', 'set_header'] + ELEMENT_ACTIONS = ['none', 'match', 'not_match', 'set'] attr_accessible :call_route_id, :var_in, :var_out, :pattern, :replacement, :action, :mandatory, :position -- cgit v1.2.3 From 808c04b5b1776927dc7b854bb2a69d34b287c24c Mon Sep 17 00:00:00 2001 From: spag Date: Fri, 18 Jan 2013 09:45:54 +0100 Subject: validations removed --- app/models/route_element.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb index 32f730d..87b26ef 100644 --- a/app/models/route_element.rb +++ b/app/models/route_element.rb @@ -7,12 +7,6 @@ class RouteElement < ActiveRecord::Base acts_as_list :scope => :call_route - validates :var_in, - :presence => true - - validates :pattern, - :presence => true - validates :action, :presence => true, :inclusion => { :in => ELEMENT_ACTIONS } -- cgit v1.2.3 From b4abd87252db53e3d79a9601cf9c581f61827f10 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 09:05:50 +0100 Subject: Added call_routes to tenant#show --- app/models/route_element.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb index 87b26ef..324a26d 100644 --- a/app/models/route_element.rb +++ b/app/models/route_element.rb @@ -13,7 +13,7 @@ class RouteElement < ActiveRecord::Base def to_s - "#{var_in} #{var_out}" + "#{pattern} => #{var_in} #{var_out}" end end -- cgit v1.2.3 From bcbfb154a321953fd32696065e6af1bec85f9345 Mon Sep 17 00:00:00 2001 From: spag Date: Sat, 19 Jan 2013 09:17:41 +0100 Subject: move methods added --- app/models/route_element.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/models/route_element.rb') diff --git a/app/models/route_element.rb b/app/models/route_element.rb index 324a26d..94f0f84 100644 --- a/app/models/route_element.rb +++ b/app/models/route_element.rb @@ -16,4 +16,11 @@ class RouteElement < ActiveRecord::Base "#{pattern} => #{var_in} #{var_out}" end + def move_up? + #return self.position.to_i > RouteElement.where(:call_route_id => self.call_route_id ).order(:position).first.position.to_i + end + + def move_down? + #return self.position.to_i < RouteElement.where(:call_route_id => self.call_route_id ).order(:position).last.position.to_i + end end -- cgit v1.2.3