Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3 from mbrochh/dont_use_attrs 

Not using attrs when getting the first user defined manager.
fix_request_path_info
Chris Glass 2011-12-20 10:53:00 -08:00
parent ce97087f78 dfc8eff1e1
commit 11daac4fef
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
polymorphic/base.py
View File

@ -63,7 +63,7 @@ class PolymorphicModelBase(ModelBase):
new_class.add_to_class(mgr_name, new_manager) new_class.add_to_class(mgr_name, new_manager)
# get first user defined manager; if there is one, make it the _default_manager # get first user defined manager; if there is one, make it the _default_manager
user_manager = self.get_first_user_defined_manager(model_name, attrs) user_manager = new_class.get_first_user_defined_manager()
if user_manager: if user_manager:
def_mgr = user_manager._copy_to_model(new_class) def_mgr = user_manager._copy_to_model(new_class)
#print '## add default manager', type(def_mgr) #print '## add default manager', type(def_mgr)
@ -120,11 +120,12 @@ class PolymorphicModelBase(ModelBase):
return add_managers return add_managers
@classmethod @classmethod
def get_first_user_defined_manager(self, model_name, attrs): def get_first_user_defined_manager(self):
mgr_list = [] mgr_list = []
for key, val in attrs.items(): for key, val in self.__dict__.items():
if not isinstance(val, models.Manager): continue item = getattr(self, key)
mgr_list.append((val.creation_counter, key, val)) if not isinstance(item, models.Manager): continue
mgr_list.append((item.creation_counter, key, item))
# if there are user defined managers, use first one as _default_manager # if there are user defined managers, use first one as _default_manager
if mgr_list: # if mgr_list: #
_, manager_name, manager = sorted(mgr_list)[0] _, manager_name, manager = sorted(mgr_list)[0]