1 files changed, 48 insertions, 18 deletions

diff --git a/recipe/models.py b/recipe/models.py
index 1db7f42..548536e 100644
--- a/recipe/models.py
+++ b/recipe/models.py
@@ -1,4 +1,6 @@
 from django.db import models
+from django.contrib import admin
+from django.db.models import fields
 
 
 class Unit(models.Model):
@@ -6,14 +8,8 @@ class Unit(models.Model):
     class Meta:
         ordering = ('name',)
 
-    name = models.CharField(max_length=100)
-    abbreviation = models.CharField(max_length=10, blank=True, null=True)
-    grams = models.DecimalField(max_digits=10, decimal_places=10,
-            blank=True, null=True,
-            help_text="Conversion from this unit to grams (dry measure)")
-    liters = models.DecimalField(max_digits=10, decimal_places=10,
-            blank=True, null=True,
-            help_text="Conversion from this unit to liters (liquid measure)")
+    name = fields.CharField(max_length=100)
+    abbreviation = fields.CharField(max_length=10, blank=True, null=True)
 
     def __unicode__(self):
         return "{0} ({1})".format(self.name, self.abbreviation)
@@ -24,14 +20,14 @@ class Recipe(models.Model):
     class Meta:
         ordering = ('title',)
 
-    title = models.CharField(max_length=100)
-    slug = models.SlugField(max_length=150)
-    description = models.TextField(blank=True, null=True)
-    servings = models.IntegerField(blank=True, null=True)
-    instructions = models.TextField()
-    oven_temp = models.IntegerField(blank=True, null=True)
-    cook_time = models.IntegerField(blank=True, null=True, help_text="In minutes")
-    prep_time = models.IntegerField(blank=True, null=True, help_text="In minutes")
+    title = fields.CharField(max_length=100)
+    slug = fields.SlugField(max_length=150)
+    description = fields.TextField(blank=True, null=True)
+    servings = fields.IntegerField(blank=True, null=True)
+    instructions = fields.TextField()
+    oven_temp = fields.IntegerField(blank=True, null=True)
+    cook_time = fields.IntegerField(blank=True, null=True, help_text="In minutes")
+    prep_time = fields.IntegerField(blank=True, null=True, help_text="In minutes")
 
     def __unicode__(self):
         return self.title
@@ -42,7 +38,7 @@ class Ingredient(models.Model):
     class Meta:
         ordering = ('name',)
 
-    name = models.CharField(max_length=100, unique=True)
+    name = fields.CharField(max_length=100, unique=True)
 
     def __unicode__(self):
         return self.name
@@ -52,8 +48,42 @@ class RecipeIngredient(models.Model):
 
     ingredient = models.ForeignKey(Ingredient)
     units = models.ForeignKey(Unit)
-    quantity = models.FloatField()
+    quantity = fields.FloatField()
     recipe = models.ForeignKey(Recipe)
 
     def __unicode__(self):
         return "{0} in {1}".format(self.ingredient.name, self.recipe.title)
+
+
+class UnitAdmin(admin.ModelAdmin):
+
+    list_display = ('name', 'abbreviation')
+    ordering = ('name',)
+
+
+class IngredientInline(admin.TabularInline):
+
+    model = RecipeIngredient
+    extra = 12
+
+
+class RecipeAdmin(admin.ModelAdmin):
+
+    list_display = ('title',)
+    inlines = (IngredientInline,)
+    search_fields = ('title',)
+    prepopulated_fields = { "slug": ("title",) }
+
+
+class IngredientAdmin(admin.ModelAdmin):
+
+    list_display = ('name',)
+    search_fields = ('name',)
+
+
+try:
+    admin.site.register(Unit, UnitAdmin)
+    admin.site.register(Ingredient, IngredientAdmin)
+    admin.site.register(Recipe, RecipeAdmin)
+except admin.sites.AlreadyRegistered:
+    pass