diff options
author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-16 23:24:54 +0100 |
---|---|---|
committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-16 23:24:54 +0100 |
commit | c06fa7cc6a499149fc8c666e4776e84b9e920788 (patch) | |
tree | 11217611edf552e15cd7682ce64b14f95e93472b /app/models | |
parent | 86b9ba00a88b455f88ced10cf959660b96113c88 (diff) | |
parent | e398d40c7ae15af9c840d0cda901303db8f22c39 (diff) |
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/call_route.rb | 2 | ||||
-rw-r--r-- | app/models/route_element.rb | 2 |
2 files changed, 4 insertions, 0 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 |