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

Update documents app

Browse Source 
Rename the DeletedDocument proxy model to a TrashedDocument.

Rename the deleted_document views to trashed_document.

Rename the document and deleted_document URL parameters to
trashed_document.

Update URL parameters to the '_id' form.

Add keyword arguments.

Update use of .filter_by_access().

Enclose trashed document restore method in a transaction.

Sort arguments.

Update app for compliance with MERCs 5 and 6.

Add document page view tests.

Add favorite document view tests.

Movernize tests.

Replace use of urlencode with furl.

Update views to use ExternalObjectMixin.

Refactor the document and version download views.

Rename the DocumentDocumentTypeEditView to DocumentChangeTypeView.

Move the trashed document views to their own module.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-01-28 05:25:48 -04:00
parent 7532429b0b
commit 74dfa53787
40 changed files with 1914 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mayan/apps/documents/managers.py
View File

@@ -40,7 +40,9 @@ class DocumentPageManager(models.Manager):
except DocumentVersion.DoesNotExist:
raise self.model.DoesNotExist
return self.get(document_version__pk=document_version.pk, page_number=page_number)
return self.get(
document_version__id=document_version.pk, page_number=page_number
)
class DocumentTypeManager(models.Manager):
@@ -61,13 +63,13 @@ class DocumentTypeManager(models.Manager):
'Document type: %s, has a deletion period delta of: %s',
document_type, delta
)
for document in document_type.deleted_documents.filter(deleted_date_time__lt=now() - delta):
for trashed_document in document_type.trashed_documents.filter(deleted_date_time__lt=now() - delta):
logger.info(
'Document "%s" with id: %d, trashed on: %s, exceded '
'delete period', document, document.pk,
document.deleted_date_time
'delete period', trashed_document, trashed_document.pk,
trashed_document.deleted_date_time
)
document.delete()
trashed_document.delete()
else:
logger.info(
'Document type: %s, has a no retention delta', document_type
@@ -120,7 +122,7 @@ class DocumentVersionManager(models.Manager):
except Document.DoesNotExist:
raise self.model.DoesNotExist
return self.get(document__pk=document.pk, checksum=checksum)
return self.get(document__id=document.pk, checksum=checksum)
class DuplicatedDocumentManager(models.Manager):
@@ -204,7 +206,7 @@ class FavoriteDocumentManager(models.Manager):
except User.DoesNotExist:
raise self.model.DoesNotExist
return self.get(document__pk=document.pk, user__pk=user.pk)
return self.get(document__id=document.pk, user__id=user.pk)
def get_for_user(self, user):
Document = apps.get_model(
@@ -254,7 +256,7 @@ class RecentDocumentManager(models.Manager):
raise self.model.DoesNotExist
return self.get(
document__pk=document.pk, user__pk=user.pk,
document__id=document.pk, user__id=user.pk,
datetime_accessed=datetime_accessed
)