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

3 files changed, 4 insertions, 3 deletions

diff --git a/app/models/call_route.rb b/app/models/call_route.rb
index de0f68a..e423030 100644
--- a/app/models/call_route.rb
+++ b/app/models/call_route.rb
@@ -6,6 +6,8 @@ class CallRoute < ActiveRecord::Base
   validates :name,
   					:presence => true
 
+  acts_as_list :scope => '`table` = \'#{table}\''
+
   def to_s
     name.to_s
   end
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
diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
index c5c7397..8be64e6 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -12,9 +12,6 @@
 %p
   %strong= t('call_routes.show.endpoint_id') + ":"
   = @call_route.endpoint_id
-%p
-  %strong= t('call_routes.show.position') + ":"
-  = @call_route.position
 
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route }