david / django-roa / changeset / 3e613d59de36

Up to file-list django_roa/db/models.py:

@@ -114,6 +114,8 @@ class ROAModelBase(ModelBase):
                     new_class._meta.local_many_to_many):
                 raise FieldError("Proxy model '%s' contains model fields."
                         % name)
             while base._meta.proxy:
                 base = base._meta.proxy_for_model
             new_class._meta.setup_proxy(base)
         # Do the appropriate setup for any model parents.
@@ -121,6 +123,7 @@ class ROAModelBase(ModelBase):
                 if isinstance(f, OneToOneField)])
         for base in parents:
             original_base = base
             if not hasattr(base, '_meta'):
                 # Things without _meta aren't functional models, so they're
                 # uninteresting parents.
@@ -165,7 +168,7 @@ class ROAModelBase(ModelBase):
             # Proxy models inherit the non-abstract managers from their base,
             # unless they have redefined any of them.
             if is_proxy:
-                new_class.copy_managers(base._meta.concrete_managers)
+                new_class.copy_managers(original_base._meta.concrete_managers)
             # Inherit virtual fields (like GenericForeignKey) from the parent
             # class
@@ -242,8 +245,8 @@ class ROAModel(models.Model):
     def get_resource_url_detail(self):
         return u"%s%s/" % (self.get_resource_url_list(), self.pk)
     def save_base(self, raw=False, cls=None, origin=None,
             force_insert=False, force_update=False):
     def save_base(self, raw=False, cls=None, origin=None, force_insert=False,
             force_update=False, using=None):
         """
         Does the heavy-lifting involved in saving. Subclasses shouldn't need to
         override this method. It's separate from save() in order to hide the
@@ -259,7 +262,7 @@ class ROAModel(models.Model):
         else:
             meta = cls._meta
-        if origin:
+        if origin and not meta.auto_created:
             signals.pre_save.send(sender=origin, instance=self, raw=raw)
         # If we are in a raw save, save the object exactly as presented.
@@ -382,6 +385,13 @@ class ROAModel(models.Model):
     delete.alters_data = True
     def _get_unique_checks(self):
         """
         We don't want to check unicity that way for now.
         """
         unique_checks, date_checks = [], []
         return unique_checks, date_checks
 ##############################################
 # HELPER FUNCTIONS (CURRIED MODEL FUNCTIONS) #

Up to file-list django_roa/db/query.py:

@@ -64,7 +64,7 @@ class Query(object):
         self.select_related = field_dict
         self.related_select_cols = []
         self.related_select_fields = []
     @property
     def parameters(self):
         """
@@ -135,6 +135,7 @@ class RemoteQuerySet(query.QuerySet):
         self._result_cache = None
         self._iter = None
         self._sticky_filter = False
         self._db = False
         self.params = {}
@@ -406,66 +407,22 @@ class RemoteQuerySet(query.QuerySet):
             return FakeInt(self.count())
         raise ROANotImplementedYetException, 'extra is not yet fully implemented.'
     #################################
     # METHODS THAT DO M2M RELATIONS #
     #################################
     def _add_items(self, source_col_name=None, target_col_name=None,
                    join_table=None, pk_val=None, instance=None, field=None,
                    *objs):
         """
         Adds m2m relations between ``instance`` object and ``objs``.
         """
         if objs:
             from django.db.models.base import Model
             # Check that all the objects are of the right type
             existing_ids = set(obj.id for obj in field.value_from_object(instance))
             for obj in objs:
                 if isinstance(obj, self.model):
                     existing_ids.add(obj._get_pk_val())
                 elif isinstance(obj, Model):
                     raise TypeError, "'%s' instance expected" % self.model._meta.object_name
                 else:
                     existing_ids.add(obj)
             # FIXME: ugly but we set manually updated_ids to the instance
             # before saving it, get back in save_model to send appropriated
             # ids to the server
             setattr(instance, '%s_updated_ids' % field.attname, existing_ids)
             instance.save()
     def _remove_items(self, source_col_name=None, target_col_name=None,
                       join_table=None, pk_val=None, instance=None, field=None,
                       *objs):
         """
         Removes m2m relations between ``instance`` object and ``objs``.
         """
         if objs:
             from django.db.models.base import Model
             # Check that all the objects are of the right type
             existing_ids = set(obj.id for obj in field.value_from_object(instance))
             for obj in objs:
                 if isinstance(obj, self.model):
                     existing_ids.remove(obj._get_pk_val())
                 elif isinstance(obj, Model):
                     raise TypeError, "'%s' instance expected" % self.model._meta.object_name
                 else:
                     existing_ids.remove(obj)
             setattr(instance, '%s_updated_ids' % field.attname, existing_ids)
             instance.save()
     def _clear_items(self, source_col_name=None, join_table=None, pk_val=None,
                      instance=None, field=None):
         """
         Clears m2m relations related to ``instance`` object.
         """
         setattr(instance, '%s_updated_ids' % field.attname, [])
         instance.save()
     ###################
     # PRIVATE METHODS #
     ###################
     def _clone(self, klass=None, setup=False, **kwargs):
         if klass is None:
             klass = self.__class__
         query = self.query.clone()
         if self._sticky_filter:
             query.filter_is_sticky = True
         c = klass(model=self.model, query=query)
         c.__dict__.update(kwargs)
         if setup and hasattr(c, '_setup_query'):
             c._setup_query()
         return c
     def _as_url(self):
         """
         Returns the internal query's URL and parameters

Up to file-list examples/django_roa_client/models.py:

 from django.db import models
 from django.template.defaultfilters import slugify
-from django_roa import Model, Manager
+from django_roa import Model
 class RemotePage(Model):
     title = models.CharField(max_length=50, blank=True, null=True)
@@ -62,7 +62,7 @@ class RemotePageWithCustomSlug(Model):
     def __unicode__(self):
         return u'%s (%s)' % (self.title, self.id)
-    def save(self, force_insert=False, force_update=False):
+    def save(self, force_insert=False, force_update=False, using=None):
         if not self.slug:
             self.slug = slugify(self.title)
         super(RemotePageWithCustomSlug, self).save(force_insert, force_update)
@@ -82,7 +82,7 @@ class RemotePageWithOverriddenUrls(Model
     def __unicode__(self):
         return u'%s (%s)' % (self.title, self.id)
-    def save(self, force_insert=False, force_update=False):
+    def save(self, force_insert=False, force_update=False, using=None):
         if not self.slug:
             self.slug = slugify(self.title)
         super(RemotePageWithOverriddenUrls, self).save(force_insert, force_update)

Up to file-list examples/django_roa_client/tests.py:

@@ -485,7 +485,9 @@ class ROAAdminTests(ROAUserTestCase):
         response = c.login(username=u'bob', password=u'secret')
         self.assertEqual(response, True)
         response = c.get('/admin/')
-        self.assertEqual(repr(response.context[-1]["user"]), '<User: bob>')
+        # ._wrapped necessary because we compare string, comparison should
         # work with User.objects.get(username="bob") but slower...
         self.assertEqual(repr(response.context[-1]["user"]._wrapped), '<User: bob>')
         response = c.get('/admin/django_roa_client/remotepage/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(repr(response.context[-1]["cl"].result_list), '[<RemotePage: Still another remote page (4)>, <RemotePage: Yet another remote page (3)>]')

commit 131:	3e613d59de36
parent 130:	2616a61bffb2
branch:	default

david / django-roa (http://welldev.org/)