Consolidate unit handling and use proxy classes.

[cookbook.git] / cookbook / admin.py

diff --git a/cookbook/admin.py b/cookbook/admin.py
index cb6a1b138958e7f3d3bbc3c0d3abea1565b155eb..fa29c02d4f4cbc75f797337eefd9c533bab6ec33 100644 (file)
--- a/cookbook/admin.py
+++ b/cookbook/admin.py
@@ -38,8 +38,10 @@ class IngredientBlockInline (admin.TabularInline):
 class RecipeAdmin (admin.ModelAdmin):
     fieldsets = [
         (None, {'fields': ['name']}),
-        ('Metadata', {'fields': ['author', 'source', 'url', 'x_yield', 'tags'],
+        ('Metadata', {'fields': ['author', 'source', 'url', 'tags'],
                       'classes': ['collapse']}),
+        ('Yield', {'fields': ['unit', 'value', 'min_value', 'max_value'],
+                   'classes': ['collapse']}),
         ('Directions', {'fields': ['directions_markdown']}),
         ]
     inlines = [IngredientBlockInline]
@@ -49,7 +51,4 @@ class RecipeAdmin (admin.ModelAdmin):
 
 admin.site.register(models.Recipe, RecipeAdmin)
 admin.site.register(models.IngredientBlock, IngredientBlockAdmin)
-admin.site.register(models.Amount)
 admin.site.register(models.Unit)
-admin.site.register(models.UnitSystem)
-admin.site.register(models.UnitType)