From 7d78aee74972b96c5c3837ccc9e6816e92f5aee6 Mon Sep 17 00:00:00 2001 From: Kriti Godey Date: Tue, 23 Feb 2010 16:18:11 -0500 Subject: [PATCH] Models work! URLs not configured yet. --- .gitignore | 2 ++ admin.py | 15 +++++++++++++++ models.py | 38 +++++++++++++++++++++++++++++++++++++- models.pyc | Bin 201 -> 2293 bytes 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 admin.py 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 110ec14f4f36c54ff85cdf073229ff371dbf7af1..46d9b0e156695c147b743ef3aaa1c3efc035abc5 100644 GIT binary patch literal 2293 zcmcIl&2Aev5FSdhejGb?;8**MRtR}5M2`eGVYS?UK{AG26|-s z*9Hcwfj-$bog|yQzyFJ$L~$zu*Q~TI54GQ6|L5SUw-Fz{DW;XP-W73mkT!R}<~NMk zI0AmxBHwNfbxDdrqh|v^fwKh&;~wdg1e0aqnfaLJu9(Ji&xfZBSgzg!ZigP5&y189 zG6vqR;T2}))?RS=S;8NXnDCTaBOD-%E~b30<>-LzsB)Q~yD%CKSIwC*OH+LC+4-m@ zU^rjKdptc&7lqGwR+@r?&|*U>>9dV6X$k~sDhEkZp1jD})%Yw9*c_aj>d?E~YOpC? zC;4J3T@hV@Jq_m9z;6S+22v~=V7ls|+G>fwud3+7zexCuKf8&9kh3RpauC&W4zA?X z(A59R=B6SFDJL>~=(1b~)N=q&=Bx{t9I2V%apS*g1ic1O%59S8-#w(h+hPS<<84XK z`{Z`$lB>_IxDUuZ6n9VDN2oenY>>=fNzd1!{$ms!%PX(T%@dRx#bp$)zNkN$!O4#XK*KO=B4#LTCu!9F-I~cG0ZJKmiak9&@86gR91r;kQso zxn%O*2!2UPYobeywa$urMXd`7a&H|F0;#O5t2`GX1kQU`P0HZv{GR8F%H#=m-(rYj zm+$!vfYMb1bYlP(7XK_(E4PdfuQAQUuw7H9{2UG-Zz`2^N zSKp}}{zHY{>m=Yy1h(%?F)fF7QeP%uzv;@#B36DfG>dpXtnVw0w9wyTF1S0!EiPAp fkfpKh?MAO8%=7xbdx6aZ0$^9|s;%~Ze}C{d#c<8j delta 101 zcmew=c#_fo;wN6NLchA~!!JHK*85gK4rphuGx3?0%E4atN^iB^UrT_Z5f$ -- 2.20.1