Merge pull request #42 from rosskarchner/master

Changes that were supposed to be in the previous pull request

setup.py

@@ -13,7 +13,7 @@
 
 
 setup(name="django-nudge",
-      version="0.5.3",
+      version="0.8",
       description="Use Nudge to (gently) push content between Django servers",
       author="Joshua Ruihley, Ross Karchner",
       author_email="joshua.ruihley@cfpb.gov",

src/nudge/client.py

@@ -1,6 +1,6 @@
 import datetime, hashlib, json, os, pickle, urllib, urllib2
 from urlparse import urljoin
-
+from itertools import chain
 from Crypto.Cipher import AES
 
 from django.core import serializers
@@ -45,8 +45,8 @@ def serialize_objects(key, batch_push_items):
             revisions.append(version.revision)
         if version.object:
             foreign_key_fields= [f for f in version.object._meta.fields if type(f) == models.fields.related.ForeignKey]
-            many_to_many_fields= version.object._meta.many_to_many
-
+            many_to_many_field_names= [field.name for field in version.object._meta.many_to_many]
+            through_field_names=[rel.get_accessor_name() for rel in version.object._meta.get_all_related_objects()]
             for related_object in [getattr(version.object, f.name) for f in foreign_key_fields]:
                 if related_object:
                     versions=get_for_object(related_object)
@@ -55,7 +55,11 @@ def serialize_objects(key, batch_push_items):
 
                     else:
                         related_objects.append(related_object)
-
+            for manager_name in chain(many_to_many_field_names, through_field_names):
+                manager=getattr(version.object, manager_name)
+                for obj in manager.all():
+                    if obj not in related_objects:
+                        related_objects.append(obj)
     batch_items_serialized = serializers.serialize("json", revisions+related_objects+batch_versions)
     b_plaintext = pickle.dumps({ 'items':batch_items_serialized })
 

src/nudge/utils.py

@@ -18,7 +18,6 @@ def __init__(self, version, batch=None):
             self.version=version
             if batch:
                 self.selected=self.key() in batch.selected_items
-
 
         def __eq__(self, other):
             return (self.content_type==other.content_type and self.pk==other.pk)
@@ -104,7 +103,7 @@ def seen(key):
         else:
             screened_pbis.append(pbi)
 
-    return screened_pbis
+    return sorted(screened_pbis, key=lambda pbi: pbi.content_type)
 
 def add_versions_to_batch(batch, versions):
     """takes a list of Version obects, and adds them to the given Batch"""