Fill in the visible flag correctly when updating the history for a way.

[rails.git] / app / models / old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 6682c644a613b0140acdb5e3b0648b59002b57a8..d89b2962168de9abf414cf6a5586d5bfa5d23960 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -5,6 +5,7 @@ class OldWay < ActiveRecord::Base
 
   def self.from_way(way)
     old_way = OldWay.new
 
   def self.from_way(way)
     old_way = OldWay.new

+    old_way.visible = way.visible

     old_way.user_id = way.user_id
     old_way.timestamp = way.timestamp
     old_way.id = way.id
     old_way.user_id = way.user_id
     old_way.timestamp = way.timestamp
     old_way.id = way.id


@@ -13,7 +14,7 @@ class OldWay < ActiveRecord::Base
     return old_way
   end
 
     return old_way
   end
 

-  def save_with_dependencies
+  def save_with_dependencies!

 
     # dont touch this unless you really have figured out why it's called
     # (Rails doesn't deal well with the old ways table (called 'ways') because
 
     # dont touch this unless you really have figured out why it's called
     # (Rails doesn't deal well with the old ways table (called 'ways') because


@@ -21,7 +22,7 @@ class OldWay < ActiveRecord::Base
     # id and get it back but we have that and we want to get the 'version' back
     # we could add another column but thats a lot of data. No, set_primary_key
     # doesn't work either.
     # id and get it back but we have that and we want to get the 'version' back
     # we could add another column but thats a lot of data. No, set_primary_key
     # doesn't work either.

-    save()
+    save!

     clear_aggregation_cache
     clear_association_cache
     @attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
     clear_aggregation_cache
     clear_association_cache
     @attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))


@@ -34,7 +35,7 @@ class OldWay < ActiveRecord::Base
       tag.v = v
       tag.id = self.id
       tag.version = self.version
       tag.v = v
       tag.id = self.id
       tag.version = self.version

-      tag.save
+      tag.save!

     end
 
     i = 0
     end
 
     i = 0


@@ -43,7 +44,7 @@ class OldWay < ActiveRecord::Base
       seg.id = self.id
       seg.segment_id = n
       seg.version = self.version
       seg.id = self.id
       seg.segment_id = n
       seg.version = self.version

-      seg.save
+      seg.save!

     end
   end
 
     end
   end
 


@@ -81,6 +82,7 @@ class OldWay < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

+    el1['user'] = self.user.display_name if self.user.data_public?

     
     self.old_segments.each do |seg| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'seg'
     
     self.old_segments.each do |seg| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'seg'