Merge pull request #2 from commoncode/develop

Develop

CHANGES.rst

@@ -1,6 +1,15 @@
 Change Log
 ==========
 
+0.2.5
+-----
+* Fix foreign key references in change messages to correctly reference 
+  related object rather than source object.
+
+0.2.4
+-----
+* Fix unicode rendering bug in DDP admin for ObjectMapping model.
+
 0.2.3
 -----
-* Add `dddp` console script to start DDP service in more robust manner than using the dddp Django mangement command.
+* Add `dddp` console script to start DDP service in more robust manner than using the dddp Django mangement command.

dddp/admin.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from django.contrib import admin
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.utils.html import format_html
@@ -6,7 +7,7 @@ from dddp import models
 
 def object_admin_link(obj):
     kwargs = {
-        'format_string': '{app_label}.{model} {object_id}: {object}',
+        'format_string': u'{app_label}.{model} {object_id}: {object}',
         'app_label': obj.content_type.app_label,
         'model': obj.content_type.model,
         'object_id': obj.object_id,

dddp/serializer.py

@@ -63,8 +63,9 @@ class Serializer(base.Serializer):
             else:
                 value = None
         else:
-            value = getattr(obj, field.get_attname())
-            value = get_meteor_id(obj)
+            value = getattr(obj, field.name)
+            if value is not None:
+                value = get_meteor_id(value)
         self._current[field.column] = value
 
     def handle_m2m_field(self, obj, field):

setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-ddp',
-    version='0.2.3',
+    version='0.2.5',
     description=__doc__,
     long_description=open('README.rst').read(),
     author='Tyson Clugg',