Change server_settings to smtp_settings to avoid deprecation warning.

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index 5c3c65e34ba190fd44769e9de1be211034515610..14949879dc6d3cb98cab74621bb2909034f42ba4 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -56,6 +56,7 @@ class Segment < ActiveRecord::Base
   def save_with_history
     begin
       Segment.transaction do
   def save_with_history
     begin
       Segment.transaction do

+        self.timestamp = Time.now

         self.save
         old_segment = OldSegment.from_segment(self)
         old_segment.save
         self.save
         old_segment = OldSegment.from_segment(self)
         old_segment.save


@@ -72,12 +73,22 @@ class Segment < ActiveRecord::Base
     return doc
   end
 
     return doc
   end
 

-  def to_xml_node
+  def to_xml_node(user_display_name_cache  = nil)

     el1 = XML::Node.new 'segment'
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s
     el1 = XML::Node.new 'segment'
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s

-    el1['user'] = self.user.display_name if self.user.data_public?
+
+    user_display_name_cache = {} if user_display_name_cache.nil?
+    if user_display_name_cache and user_display_name_cache[self.user_id]
+      # use the cache if available
+    else
+      user_display_name_cache[self.user_id] = self.user.display_name
+    end
+    
+    #el1['user'] = self.user.display_name if self.user.data_public?
+    el1['user'] = user_display_name_cache[self.user_id]
+

     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema