git.ithinksw.org
/
~kgodey
/
maayanwich.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added necessity for user authentication to add sandwich, ingredient, and templated...
[~kgodey/maayanwich.git]
/
models.py
diff --git
a/models.py
b/models.py
index
6c4f4b0
..
3139b47
100644
(file)
--- a/
models.py
+++ b/
models.py
@@
-1,6
+1,8
@@
from django.db import models
from django.contrib.auth.models import User
import datetime
from django.db import models
from django.contrib.auth.models import User
import datetime
+from django.core.urlresolvers import reverse
+from django.template.defaultfilters import slugify
class Ingredient(models.Model):
class Ingredient(models.Model):
@@
-11,23
+13,12
@@
class Ingredient(models.Model):
return self.name
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()
ingredients = models.ManyToManyField(Ingredient)
date_added = models.DateTimeField(default=datetime.datetime.now, editable=False)
class Sandwich(models.Model):
adjective = models.CharField(max_length=200)
slug = models.SlugField()
date_made = models.DateField()
ingredients = models.ManyToManyField(Ingredient)
date_added = models.DateTimeField(default=datetime.datetime.now, editable=False)
- artist = models.ForeignKey(Artist, related_name='Artist')
- patron = models.ForeignKey(Artist, related_name='Patron')
picture = models.ImageField(upload_to='sandwiches/')
notes = models.TextField()
user = models.ForeignKey(User)
picture = models.ImageField(upload_to='sandwiches/')
notes = models.TextField()
user = models.ForeignKey(User)
@@
-38,3
+29,10
@@
class Sandwich(models.Model):
def __unicode__(self):
return self.adjective
def __unicode__(self):
return self.adjective
+
+ def get_absolute_url(self):
+ return reverse('sandwich_by_slug', kwargs={'slug':self.slug})
+
+ def save(self, *args, **kwargs):
+ self.slug = slugify(self.adjective)
+ super(Sandwich, self).save(*args, **kwargs)