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

minor additions in base.py

fix_request_path_info
Bert Constantin 2010-11-30 22:47:52 +01:00
parent 4a4cfd82a2
commit 3cc7d483c1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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(attrs) user_manager = self.get_first_user_defined_manager(model_name, attrs)
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)
@ -104,14 +104,16 @@ class PolymorphicModelBase(ModelBase):
return add_managers return add_managers
@classmethod @classmethod
def get_first_user_defined_manager(self, attrs): def get_first_user_defined_manager(self, model_name, attrs):
mgr_list = [] mgr_list = []
for key, val in attrs.items(): for key, val in attrs.items():
if not isinstance(val, models.Manager): continue if not isinstance(val, models.Manager): continue
mgr_list.append((val.creation_counter, val)) mgr_list.append((val.creation_counter, key, val))
# 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 = sorted(mgr_list)[0] _, manager_name, manager = sorted(mgr_list)[0]
#sys.stderr.write( '\n# first user defined manager for model "{model}":\n# "{mgrname}": {mgr}\n# manager model: {mgrmodel}\n\n'
# .format( model=model_name, mgrname=manager_name, mgr=manager, mgrmodel=manager.model ) )
return manager return manager
return None return None