Reject note comments with no text

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 5643a389bc8ad69fb83f7f886b122e97f4cbe8ff..c2ec43c9c0431d40357c80803486d71ed87a1799 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,11 +1,14 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
-  include Redactable
 
   self.table_name = "nodes"
   self.primary_keys = "node_id", "version"
 
+  # note this needs to be included after the table name changes, or
+  # the queries generated by Redactable will use the wrong table name.
+  include Redactable
+
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
@@ -42,13 +45,6 @@ class OldNode < ActiveRecord::Base
   def to_xml_node
     el1 = XML::Node.new 'node'
     el1['id'] = self.node_id.to_s
-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.to_s
-    el1['changeset'] = self.changeset.id.to_s
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
@@ -57,9 +53,23 @@ class OldNode < ActiveRecord::Base
       el1 << el2
     end
 
+    if self.visible?
+      el1['lat'] = self.lat.to_s
+      el1['lon'] = self.lon.to_s
+    end
+    
+    el1['changeset'] = self.changeset.id.to_s
+    if self.changeset.user.data_public?
+      el1['user'] = self.changeset.user.display_name
+      el1['uid'] = self.changeset.user.id.to_s
+    end
+
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['version'] = self.version.to_s
+    
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?
+
     return el1
   end