Merge branch '0.4.8'

This commit is contained in:
Corey Oordt 2010-12-10 06:57:07 -05:00
commit b9e54d45f3
4 changed files with 10 additions and 6 deletions

View file

@ -1,7 +1,7 @@
__version_info__ = {
'major': 0,
'minor': 4,
'micro': 7,
'micro': 8,
'releaselevel': 'final',
'serial': 0
}

View file

@ -106,6 +106,6 @@ for model,modeladmin in admin.site._registry.items():
admin.site.unregister(model)
admin.site.register(model, type('newadmin', (modeladmin.__class__,), {
'fieldsets': getattr(modeladmin, 'fieldsets', ()) + (('Categories',{
'fields': ('category','categories'),
'fields': [cat.split('.')[1] for cat in registry]
}),)
}))

View file

@ -38,19 +38,23 @@ class Category(MPTTModel):
default="",
help_text="(Advanced) Any additional HTML to be placed verbatim in the <head>")
def get_absolute_url(self):
"""Return a path"""
prefix = reverse('categories_tree_list')
ancestors = list(self.get_ancestors()) + [self,]
return prefix + '/'.join([force_unicode(i.slug) for i in ancestors]) + '/'
class Meta:
verbose_name_plural = 'categories'
unique_together = ('parent', 'name')
ordering = ('tree_id', 'lft')
class MPTTMeta:
verbose_name_plural = 'categories'
unique_together = ('parent', 'name')
ordering = ('tree_id', 'lft')
order_insertion_by = 'name'
def __unicode__(self):
ancestors = self.get_ancestors()
return ' > '.join([force_unicode(i.name) for i in ancestors]+[self.name,])

View file

@ -1 +1 @@
django-mptt==0.4.1
django-mptt==0.4.2