From: Kriti Godey Date: Tue, 23 Feb 2010 21:18:11 +0000 (-0500) Subject: Models work! URLs not configured yet. X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/commitdiff_plain/7d78aee74972b96c5c3837ccc9e6816e92f5aee6 Models work! URLs not configured yet. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d0a113f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +.DS_Store \ No newline at end of file diff --git a/admin.py b/admin.py new file mode 100644 index 0000000..ad93a1a --- /dev/null +++ b/admin.py @@ -0,0 +1,15 @@ +from django.contrib import admin +from recipes.maayanwich.models import Artist, Ingredient, Sandwich + +class ArtistAdmin(admin.ModelAdmin): + prepopulated_fields = {"slug": ("name",)} + +class IngredientAdmin(admin.ModelAdmin): + prepopulated_fields = {"slug": ("name",)} + +class SandwichAdmin(admin.ModelAdmin): + prepopulated_fields = {"slug": ("adjective",)} + +admin.site.register(Artist, ArtistAdmin) +admin.site.register(Ingredient, IngredientAdmin) +admin.site.register(Sandwich, SandwichAdmin) \ No newline at end of file diff --git a/models.py b/models.py index 71a8362..4ed80d8 100644 --- a/models.py +++ b/models.py @@ -1,3 +1,39 @@ from django.db import models +from django.contrib.auth.models import User +import datetime -# Create your models here. + +class Ingredient(models.Model): + name = models.CharField(max_length=100) + slug = models.SlugField() + + def __unicode__(self): + return self.name + + +class Artist(models.Model): + name = models.CharField(max_length=150) + slug = models.SlugField() + bio = models.TextField() + + def __unicode__(self): + return self.name + + +class Sandwich(models.Model): + adjective = models.CharField(max_length=200) + slug = models.SlugField() + date_made = models.DateField() + date_added = models.DateTimeField(default=datetime.datetime.now, editable=False) + artist = models.ForeignKey(Artist) + ingredients = models.ManyToManyField(Ingredient) + picture = models.ImageField(upload_to='sandwiches/') + notes = models.TextField() + + class Meta: + ordering = ['date_added'] + verbose_name_plural = "Sandwiches" + + def __unicode__(self): + return self.adjective + \ No newline at end of file diff --git a/models.pyc b/models.pyc index 110ec14..46d9b0e 100644 Binary files a/models.pyc and b/models.pyc differ