Merge branch 'master' into mcronce-disable_encryption

This commit is contained in:
Daniel Quinn 2018-06-17 16:32:51 +01:00 committed by GitHub
commit c9f35a7da2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 279 additions and 135 deletions

View file

@ -236,6 +236,7 @@ class Document(models.Model):
default=timezone.now, db_index=True)
modified = models.DateTimeField(
auto_now=True, editable=False, db_index=True)
storage_type = models.CharField(
max_length=11,
choices=STORAGE_TYPES,
@ -243,6 +244,9 @@ class Document(models.Model):
editable=False
)
added = models.DateTimeField(
default=timezone.now, editable=False, db_index=True)
class Meta:
ordering = ("correspondent", "title")