summaryrefslogtreecommitdiff
path: root/chimere/admin.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/admin.py')
-rw-r--r--chimere/admin.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index f7acabf..b6437f9 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -169,13 +169,6 @@ class AreaAdmin(admin.ModelAdmin):
exclude = ['upper_left_corner', 'lower_right_corner']
inlines = [LayerInline]
-class SubCategoryAdmin(admin.ModelAdmin):
- """
- Specialized the subcategory admin
- """
- list_display = ('name', 'category', 'available')
- list_filter = ('category',)
-
def importing(modeladmin, request, queryset):
for importer in queryset:
importer.state = unicode(tasks.IMPORT_MESSAGES['import_pending'][0])
@@ -219,11 +212,17 @@ class NewsAdmin(admin.ModelAdmin):
"""
form = NewsAdminForm
+class SubcatInline(admin.TabularInline):
+ model = SubCategory
+ extra = 1
+
class CategoryAdmin(admin.ModelAdmin):
"""
Use the TinyMCE widget for categories
"""
form = CategoryAdminForm
+ inlines = [SubcatInline]
+ list_display = ['name', 'order']
class ColorInline(admin.TabularInline):
model = Color
@@ -256,7 +255,6 @@ class PictureFileAdmin(admin.ModelAdmin):
admin.site.register(News, NewsAdmin)
admin.site.register(Category, CategoryAdmin)
admin.site.register(Icon, IconAdmin)
-admin.site.register(SubCategory, SubCategoryAdmin)
admin.site.register(Marker, MarkerAdmin)
admin.site.register(RouteFile, RouteFileAdmin)
admin.site.register(Route, RouteAdmin)