Ticket #6913: databrowse-fix-for-one-to-one.patch

datastructures.py

@@ -121 +121 @@
         EasyInstance's model as a ForeignKey or ManyToManyField, along with
         lists of related objects.
         """
+        def get_rel_list( instance, rel_object ):
+            attr = rel_object.get_accessor_name()
+            if rel_object.field.rel.multiple:
+                return getattr(instance, attr ).all()
+            else:
+                return [ getattr( instance, attr ) ]
+            
         for rel_object in self.model.model._meta.get_all_related_objects() + self.model.model._meta.get_all_related_many_to_many_objects():
             if rel_object.model not in self.model.model_list:
                 continue # Skip models that aren't in the model_list
@@ -128 +135 @@
             yield {
                 'model': em,
                 'related_field': rel_object.field.verbose_name,
-                'object_list': [EasyInstance(em, i) for i in getattr(self.instance, rel_object.get_accessor_name()).all()],
+                'object_list': [EasyInstance(em, i) for i in get_rel_list( self.instance, rel_object ) ] 
             }
 
 class EasyInstanceField(object):