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
minor fixes
[~kgodey/maayanwich.git]
/
models.py
diff --git
a/models.py
b/models.py
index
abbf825
..
37fe7dc
100644
(file)
--- a/
models.py
+++ b/
models.py
@@
-1,23
+1,26
@@
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 slugify import SlugifyUniquely
class Ingredient(models.Model):
name = models.CharField(max_length=100)
class Ingredient(models.Model):
name = models.CharField(max_length=100)
- slug = models.SlugField()
+ slug = models.SlugField(
unique=True
)
def __unicode__(self):
return self.name
def __unicode__(self):
return self.name
+
class Sandwich(models.Model):
adjective = models.CharField(max_length=200)
class Sandwich(models.Model):
adjective = models.CharField(max_length=200)
- slug = models.SlugField()
+ slug = models.SlugField(
unique=True
)
date_made = models.DateField()
ingredients = models.ManyToManyField(Ingredient)
date_added = models.DateTimeField(default=datetime.datetime.now, editable=False)
date_made = models.DateField()
ingredients = models.ManyToManyField(Ingredient)
date_added = models.DateTimeField(default=datetime.datetime.now, editable=False)
- picture = models.ImageField(upload_to='sandwiches/')
- notes = models.TextField()
+ picture = models.ImageField(upload_to='sandwiches/'
, blank=True
)
+ notes = models.TextField(
blank=True
)
user = models.ForeignKey(User)
class Meta:
user = models.ForeignKey(User)
class Meta:
@@
-26,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 = SlugifyUniquely(self.adjective, Sandwich)
+ super(Sandwich, self).save(*args, **kwargs)