Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '0.3'

Browse source
This commit is contained in:
Corey Oordt 2010-04-23 11:00:37 -04:00
commit 760f95f457
4 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
categories/admin.py
View file

@ -36,6 +36,12 @@ class CategoryAdminForm(forms.ModelForm):
self.cleaned_data['slug'] = slugify(self.cleaned_data['name'])
return self.cleaned_data['slug']
def clean_alternate_title(self):
if self.instance is None or not self.cleaned_data['alternate_title']:
return self.cleaned_data['name']
else:
return self.cleaned_data['alternate_title']
def clean(self):
super(CategoryAdminForm, self).clean()
@ -65,6 +71,19 @@ class CategoryAdmin(TreeEditor, admin.ModelAdmin):
list_display = ('__unicode__',)
search_fields = (('name',))
prepopulated_fields = {'slug': ('name',)}
fieldsets = (
(None, {
'fields': ('parent', 'name')
}),
('Meta Data', {
'fields': ('alternate_title', 'description', 'meta_keywords', 'meta_extra'),
'classes': ('collapse',),
}),
('Advanced', {
'fields': ('order', 'slug'),
'classes': ('collapse',),
}),
)
admin.site.register(Category, CategoryAdmin)

6
categories/migration/2add_metadata.sql Normal file
View file

@ -0,0 +1,6 @@
BEGIN;
ALTER TABLE "categories_category" ADD COLUMN "alternate_title" varchar(100);
ALTER TABLE "categories_category" ADD COLUMN "meta_keywords" varchar(255);
ALTER TABLE "categories_category" ADD COLUMN "meta_extra" text;
ALTER TABLE "categories_category" ALTER COLUMN "description" TYPE text;
COMMIT;

6
categories/migration/2drop_metadata.sql Normal file
View file

@ -0,0 +1,6 @@
BEGIN;
ALTER TABLE "categories_category" DROP COLUMN "alternate_title" varchar(100);
ALTER TABLE "categories_category" DROP COLUMN "meta_keywords" varchar(255);
ALTER TABLE "categories_category" DROP COLUMN "meta_extra" text;
ALTER TABLE "categories_category" ALTER COLUMN "description" TYPE varchar(255);
COMMIT;

18
categories/models.py
View file

@ -13,9 +13,25 @@ class Category(models.Model):
help_text="Leave this blank for an Category Tree",
verbose_name='Parent')
name = models.CharField(max_length=100)
description = models.CharField(blank=True, null=True, max_length=255)
order = models.IntegerField(blank=True, null=True)
slug = models.SlugField()
alternate_title = models.CharField(
blank=True,
default="",
max_length=100,
help_text="An alternative title to use on pages with this category."
)
description = models.TextField(blank=True, null=True)
meta_keywords = models.CharField(
blank=True,
default="",
max_length=255,
help_text="Comma-separated keywords for search engines.")
meta_extra = models.TextField(
blank=True,
default="",
help_text="(Advanced) Any additional HTML to be placed verbatim in the <head>")
def get_absolute_url(self):
"""Return a path"""