moved media to media folder in app

[~kgodey/maayanwich.git] / models.py

diff --git a/models.py b/models.py
index 6c4f4b0..37fe7dc 100644 (file)
--- a/models.py
+++ b/models.py
@@ -1,20 +1,13 @@
 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()
-       
-       def __unicode__(self):
-               return self.name
-
-
-class Artist(models.Model):
-       name = models.CharField(max_length=150)
-       slug = models.SlugField()
-       bio = models.TextField()
+       slug = models.SlugField(unique=True)

        
        def __unicode__(self):
                return self.name
        
        def __unicode__(self):
                return self.name


@@ -22,14 +15,12 @@ class Artist(models.Model):
 
 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)

-       artist = models.ForeignKey(Artist, related_name='Artist')
-       patron = models.ForeignKey(Artist, related_name='Patron')
-       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:


@@ -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 = SlugifyUniquely(self.adjective, Sandwich)
+               super(Sandwich, self).save(*args, **kwargs)