From fb2572820213a28f225c7c577ba4b8af5c3009b2 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 13 Jun 2012 03:39:12 -0400 Subject: [PATCH] Add user object field to checkout model --- apps/checkouts/models.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/checkouts/models.py b/apps/checkouts/models.py index 31a49566ff..198cf78277 100644 --- a/apps/checkouts/models.py +++ b/apps/checkouts/models.py @@ -5,6 +5,8 @@ import datetime from django.db import models, IntegrityError from django.utils.translation import ugettext_lazy as _ +from django.contrib.contenttypes.models import ContentType +from django.contrib.contenttypes import generic from documents.models import Document @@ -19,9 +21,13 @@ class DocumentCheckout(models.Model): Model to store the state and information of a document checkout """ document = models.ForeignKey(Document, verbose_name=_(u'document'), unique=True) - checkout_datetime = models.DateTimeField(verbose_name=_(u'checkout date and time'), default=datetime.datetime.now()) - expiration_datetime = models.DateTimeField(verbose_name=_(u'checkout expiration date and time')) + checkout_datetime = models.DateTimeField(verbose_name=_(u'check out date and time'), blank=True, null=True) + expiration_datetime = models.DateTimeField(verbose_name=_(u'check out expiration date and time'), help_text=_(u'Amount of time to hold the document checked out in minutes.')) block_new_version = models.BooleanField(verbose_name=_(u'block new version upload'), help_text=_(u'Do not allow new version of this document to be uploaded.')) + user_content_type = models.ForeignKey(ContentType, null=True, blank=True) # blank and null added for ease of db migration + user_object_id = models.PositiveIntegerField(null=True, blank=True) + user_object = generic.GenericForeignKey(ct_field='user_content_type', fk_field='user_object_id') + #block_metadata #block_editing #block tag add/remove @@ -33,7 +39,7 @@ class DocumentCheckout(models.Model): def save(self, *args, **kwargs): if not self.pk: - self.checkout_date = datetime.datetime.now() + self.checkout_datetime = datetime.datetime.now() try: return super(DocumentCheckout, self).save(*args, **kwargs) except IntegrityError, exc: @@ -42,6 +48,8 @@ class DocumentCheckout(models.Model): #else: raise + #TODO: clean method that raises DocumentAlreadyCheckedOut + @models.permalink def get_absolute_url(self): return ('checkout_info', [self.document.pk])