summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 23:24:54 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 23:24:54 +0100
commitc06fa7cc6a499149fc8c666e4776e84b9e920788 (patch)
tree11217611edf552e15cd7682ce64b14f95e93472b /app
parent86b9ba00a88b455f88ced10cf959660b96113c88 (diff)
parente398d40c7ae15af9c840d0cda901303db8f22c39 (diff)
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'app')
-rw-r--r--app/models/call_route.rb2
-rw-r--r--app/models/route_element.rb2
-rw-r--r--app/views/call_routes/show.html.haml3
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 }