Merge branch 'development' into feature/multi-tenant

This commit is contained in:
Roberto Rosario
2016-05-17 17:02:00 -04:00
86 changed files with 1485 additions and 544 deletions
+5 -3
View File
@@ -176,7 +176,8 @@ class Document(models.Model):
verbose_name=_('Language')
)
in_trash = models.BooleanField(
default=False, editable=False, verbose_name=_('In trash?')
db_index=True, default=False, editable=False,
verbose_name=_('In trash?')
)
# TODO: set editable to False
deleted_date_time = models.DateTimeField(
@@ -184,10 +185,11 @@ class Document(models.Model):
verbose_name=_('Date and time trashed')
)
is_stub = models.BooleanField(
default=True, editable=False, help_text=_(
db_index=True, default=True, editable=False, help_text=_(
'A document stub is a document with an entry on the database but '
'no file uploaded. This could be an interrupted upload or a '
'deferred upload via the API.'), verbose_name=_('Is stub?')
'deferred upload via the API.'
), verbose_name=_('Is stub?')
)
objects = DocumentManager()