matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add checkout expiration time validation. Sort field arguments according to style guide.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-07 20:48:36 -04:00
parent b96ba86991
commit 17c454a53a
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mayan/apps/checkouts/models.py
View File

@@ -3,9 +3,11 @@ from __future__ import unicode_literals
import logging
from django.conf import settings
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
from documents.models import Document
@@ -22,24 +24,21 @@ class DocumentCheckout(models.Model):
"""
Model to store the state and information of a document checkout
"""
document = models.ForeignKey(Document, verbose_name=_('Document'), unique=True)
checkout_datetime = models.DateTimeField(verbose_name=_('Check out date and time'), auto_now_add=True)
expiration_datetime = models.DateTimeField(verbose_name=_('Check out expiration date and time'), help_text=_('Amount of time to hold the document checked out in minutes.'))
document = models.ForeignKey(Document, unique=True, verbose_name=_('Document'))
checkout_datetime = models.DateTimeField(auto_now_add=True, verbose_name=_('Check out date and time'))
expiration_datetime = models.DateTimeField(help_text=_('Amount of time to hold the document checked out in minutes.'), verbose_name=_('Check out expiration date and time'))
user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('User'))
block_new_version = models.BooleanField(default=True, verbose_name=_('Block new version upload'), help_text=_('Do not allow new version of this document to be uploaded.'))
# TODO: add more blocking
# block_metadata
# block_editing
# block tag add/remove
block_new_version = models.BooleanField(default=True, help_text=_('Do not allow new version of this document to be uploaded.'), verbose_name=_('Block new version upload'))
objects = DocumentCheckoutManager()
def __str__(self):
return unicode(self.document)
def clean(self):
if self.expiration_datetime < now():
raise ValidationError(_('Check out expiration date and time must be in the future.'))
def save(self, *args, **kwargs):
new_checkout = not self.pk
if not new_checkout or self.document.is_checked_out():
@@ -48,6 +47,8 @@ class DocumentCheckout(models.Model):
result = super(DocumentCheckout, self).save(*args, **kwargs)
if new_checkout:
event_document_check_out.commit(actor=self.user, target=self.document)
logger.info('Document "%s" checked out by user "%s"', self.document, self.user)
return result
def get_absolute_url(self):