Return usernames correctly.

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index b6f60ec3f9dd9d2c181d229ff85c958fb2e15f31..246570b46ae1ee3db2b8491308b8d29ff951b175 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -78,14 +78,18 @@ class Segment < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s

+
+    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
     if user_display_name_cache and user_display_name_cache[self.user_id]
       # use the cache if available

-    else
+    elsif self.user.data_public?

       user_display_name_cache[self.user_id] = self.user.display_name
       user_display_name_cache[self.user_id] = self.user.display_name

+    else
+      user_display_name_cache[self.user_id] = nil

     end
     end

-    
-    #el1['user'] = self.user.display_name if self.user.data_public?
-    el1['user'] = user_display_name_cache[self.user_id]
+
+    el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?

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