From a3d9379876a2c5b6cf3e289588702ff487d83fd9 Mon Sep 17 00:00:00 2001 From: Frankie Dintino Date: Fri, 30 Jan 2015 14:14:01 -0500 Subject: [PATCH] Set _default_manager directly on model_cls; don't use add_to_class() Using model_cls.add_to_class() calls Manager.contribute_to_class(), which then sets the attribute to an instance of ManagerDescriptor. In the case of _default_manager, this behavior differs from Django's, as _default_manager is set to the manager instance itself, not its descriptor. This is why it is normally possible to access default_manager from a model instance. fixes #96 --- polymorphic/base.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/polymorphic/base.py b/polymorphic/base.py index a407285..83cb7a4 100644 --- a/polymorphic/base.py +++ b/polymorphic/base.py @@ -77,15 +77,17 @@ class PolymorphicModelBase(ModelBase): for source_name, mgr_name, manager in inherited_managers: #print '** add inherited manager from model %s, manager %s, %s' % (source_name, mgr_name, manager.__class__.__name__) new_manager = manager._copy_to_model(new_class) - new_class.add_to_class(mgr_name, new_manager) + if mgr_name == '_default_manager': + new_class._default_manager = new_manager + else: + new_class.add_to_class(mgr_name, new_manager) # get first user defined manager; if there is one, make it the _default_manager # this value is used by the related objects, restoring access to custom queryset methods on related objects. user_manager = self.get_first_user_defined_manager(new_class) if user_manager: - def_mgr = user_manager._copy_to_model(new_class) #print '## add default manager', type(def_mgr) - new_class.add_to_class('_default_manager', def_mgr) + new_class._default_manager = user_manager._copy_to_model(new_class) new_class._default_manager._inherited = False # the default mgr was defined by the user, not inherited # validate resulting default manager