a few admin changes to make entering data easier

examples/cookbook/cookbook/ingredients/admin.py

@@ -2,5 +2,9 @@ from django.contrib import admin
 
 from cookbook.ingredients.models import Category, Ingredient
 
-admin.site.register(Ingredient)
+@admin.register(Ingredient)
+class IngredientAdmin(admin.ModelAdmin):
+  list_display = ("id","name","category")
+  list_editable = ("name","category")
+  
 admin.site.register(Category)

examples/cookbook/cookbook/ingredients/migrations/0002_auto_20161104_0050.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-11-04 00:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingredients', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ingredient',
+            name='notes',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

examples/cookbook/cookbook/ingredients/models.py

@@ -10,7 +10,7 @@ class Category(models.Model):
 
 class Ingredient(models.Model):
     name = models.CharField(max_length=100)
-    notes = models.TextField()
+    notes = models.TextField(null=True,blank=True)
     category = models.ForeignKey(Category, related_name='ingredients')
 
     def __str__(self):

examples/cookbook/cookbook/recipes/admin.py

@@ -2,5 +2,9 @@ from django.contrib import admin
 
 from cookbook.recipes.models import Recipe, RecipeIngredient
 
-admin.site.register(Recipe)
+class RecipeIngredientInline(admin.TabularInline):
-admin.site.register(RecipeIngredient)
+  model = RecipeIngredient
+
+@admin.register(Recipe)
+class RecipeAdmin(admin.ModelAdmin):
+  inlines = [RecipeIngredientInline]

examples/cookbook/cookbook/recipes/models.py

@@ -6,14 +6,15 @@ from cookbook.ingredients.models import Ingredient
 class Recipe(models.Model):
     title = models.CharField(max_length=100)
     instructions = models.TextField()
-
+    __unicode__ = lambda self: self.title
 
 class RecipeIngredient(models.Model):
     recipes = models.ForeignKey(Recipe, related_name='amounts')
     ingredient = models.ForeignKey(Ingredient, related_name='used_by')
     amount = models.FloatField()
     unit = models.CharField(max_length=20, choices=(
+        ('unit', 'Units'),
         ('kg', 'Kilograms'),
         ('l', 'Litres'),
-        ('', 'Units'),
+        ('st', 'Shots'),
     ))