diff -r 8234cb238783 -r 8e00641076e7 src/hdalab/models/renkan.py --- a/src/hdalab/models/renkan.py Fri Jul 18 13:29:53 2014 +0200 +++ b/src/hdalab/models/renkan.py Mon Jul 21 16:07:00 2014 +0200 @@ -3,13 +3,11 @@ @author: tc ''' -from django.conf import settings from django.db import models -from hdabo.models import User -from easy_thumbnails.fields import ThumbnailerImageField +from renkanmanager.models import Renkan -class Renkan(models.Model): +class HdalabRenkan(models.Model): EDITION = 1 PUBLISHED = 2 @@ -23,14 +21,8 @@ (REJECTED, 'rejected'), ) - owner = models.ForeignKey(User, blank=False, null=False) - rk_id = models.CharField(max_length=1024, unique=True, blank=False, null=False) # typically UUID - content = models.TextField(blank=True, null=True) - title = models.CharField(max_length=1024, null=True) + renkan = models.ForeignKey(Renkan, blank=False, null=False) state = models.IntegerField(choices=STATE_CHOICES, default=1) - image = ThumbnailerImageField(upload_to="thumbnails/renkan/", default=settings.DEFAULT_RENKAN_ICON) - creation_date = models.DateTimeField(auto_now_add=True) - modification_date = models.DateTimeField(auto_now=True) class Meta: app_label = 'hdalab'