From 810c0135bc448371dddd5232d5339edcb3bbb464 Mon Sep 17 00:00:00 2001 From: Michel Etienne Date: Tue, 20 Jan 2015 15:58:38 +0100 Subject: stop area copy routes to copy instead of original --- app/models/stop_area_copy.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'app/models') diff --git a/app/models/stop_area_copy.rb b/app/models/stop_area_copy.rb index 796aba567..041d30eb9 100644 --- a/app/models/stop_area_copy.rb +++ b/app/models/stop_area_copy.rb @@ -5,7 +5,7 @@ class StopAreaCopy include ActiveModel::Conversion extend ActiveModel::Naming - attr_accessor :source_id, :hierarchy, :area_type, :source + attr_accessor :source_id, :hierarchy, :area_type, :source, :copy validates_presence_of :source_id, :hierarchy, :area_type @@ -40,17 +40,17 @@ class StopAreaCopy begin if self.valid? self.source ||= Chouette::StopArea.find self.source_id - copy = source.duplicate - copy.name = source.name - copy.area_type = self.area_type.camelcase + self.copy = source.duplicate + self.copy.name = source.name + self.copy.area_type = self.area_type.camelcase Chouette::StopArea.transaction do if self.hierarchy == "child" - copy.parent_id = source.id + self.copy.parent_id = source.id end - copy.save! + self.copy.save! if self.hierarchy == "parent" - source.parent_id = copy.id - source.save! + self.source.parent_id = copy.id + self.source.save! end end true -- cgit v1.2.3