Merge branch 'develop' of github.com:amooma/GS5 into develop

Conflicts:
	misc/freeswitch/scripts/dialplan/router.lua

2 files changed, 10 insertions, 0 deletions

diff --git a/app/models/call_route.rb b/app/models/call_route.rb
new file mode 100644
index 0000000..eba247c
--- /dev/null
+++ b/app/models/call_route.rb
@@ -0,0 +1,5 @@
+class CallRoute < ActiveRecord::Base
+  attr_accessible :table, :name, :endpoint_type, :endpoint_id, :position
+
+  has_many :route_elements, :dependent => :destroy
+end
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