Remove tables from password reset form

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 390c142dbc1b940773b8185b8e352f94f6b2dfe0..b2e86c930b4caaf5262af950c930b63ddbce82f8 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -93,17 +93,34 @@ class OldRelation < ActiveRecord::Base
     return doc
   end
 
     return doc
   end
 

-  def to_xml_node
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})

     el1 = XML::Node.new 'relation'
     el1['id'] = self.relation_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1 = XML::Node.new 'relation'
     el1['id'] = self.relation_id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end

     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s

+
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id
+    end
+
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
+      # use the cache if available
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[user_id] = self.changeset.user.display_name
+    else
+      user_display_name_cache[user_id] = nil
+    end
+
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
+    end

     
     el1['redacted'] = self.redaction.id.to_s if self.redacted?
     
     
     el1['redacted'] = self.redaction.id.to_s if self.redacted?