merge head

This commit is contained in:
Fred 2015-12-08 21:23:34 +01:00
commit f8da7d8d3c
1 changed files with 10 additions and 7 deletions

View File

@ -4,14 +4,19 @@ from django.contrib.auth.models import User
import uuid
class Wishlist(models.Model):
class AbstractModel(models.Model):
class Meta:
abstract = True
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
class Wishlist(AbstractModel):
name = models.CharField(max_length=255)
description = models.TextField()
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
external_id = models.UUIDField(unique=True, default=uuid.uuid4,
editable=False)
external_id = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
@staticmethod
def create(name, description):
@ -27,8 +32,6 @@ class Wish(models.Model):
wishlist = models.ForeignKey(Wishlist, related_name='items')
name = models.CharField(max_length=255)
description = models.TextField()
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
picture = models.ImageField(null=True)
numbers_available = models.IntegerField(default=1)
number_of_parts = models.IntegerField(null=True)