amf get*_history tests and related fixes

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index be990e589a2135b0c88b714927ce6824bd29d8cb..1bbb1d8e93fc9218224e18872dc87d069486e6b6 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -83,7 +83,10 @@ class Relation < ActiveRecord::Base
       user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
+    if not user_display_name_cache[self.changeset.user_id].nil?
+      el1['user'] = user_display_name_cache[self.changeset.user_id]
+      el1['uid'] = self.changeset.user_id.to_s
+    end
 
     self.relation_members.each do |member|
       p=0