Update documents app

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
+29 -30
View File
@@ -68,9 +68,8 @@ def new_documents_this_month(user=None):
queryset = Document.objects.all()
if user:
queryset = AccessControlList.objects.filter_by_access(
permission=permission_document_view, user=user,
queryset=queryset
queryset = AccessControlList.objects.restrict_queryset(
permission=permission_document_view, queryset=queryset, user=user
)
qss = qsstats.QuerySetStats(queryset, 'date_added')
@@ -110,9 +109,9 @@ def new_document_pages_this_month(user=None):
queryset = DocumentPage.objects.all()
if user:
queryset = AccessControlList.objects.filter_by_access(
permission=permission_document_view, user=user,
queryset=queryset
queryset = AccessControlList.objects.restrict_queryset(
permission=permission_document_view, queryset=queryset,
user=user
)
qss = qsstats.QuerySetStats(
@@ -230,44 +229,44 @@ def total_document_page_per_month():
namespace = StatisticNamespace(slug='documents', label=_('Documents'))
namespace.add_statistic(
klass=StatisticLineChart,
slug='new-documents-per-month',
label=_('New documents per month'),
func=new_documents_per_month,
minute='0'
klass=StatisticLineChart,
label=_('New documents per month'),
minute='0',
slug='new-documents-per-month'
)
namespace.add_statistic(
klass=StatisticLineChart,
slug='new-document-versions-per-month',
label=_('New document versions per month'),
func=new_document_versions_per_month,
minute='0'
klass=StatisticLineChart,
label=_('New document versions per month'),
minute='0',
slug='new-document-versions-per-month'
)
namespace.add_statistic(
klass=StatisticLineChart,
slug='new-document-pages-per-month',
label=_('New document pages per month'),
func=new_document_pages_per_month,
minute='0'
klass=StatisticLineChart,
label=_('New document pages per month'),
minute='0',
slug='new-document-pages-per-month'
)
namespace.add_statistic(
klass=StatisticLineChart,
slug='total-documents-at-each-month',
label=_('Total documents at each month'),
func=total_document_per_month,
minute='0'
klass=StatisticLineChart,
label=_('Total documents at each month'),
minute='0',
slug='total-documents-at-each-month'
)
namespace.add_statistic(
klass=StatisticLineChart,
slug='total-document-versions-at-each-month',
label=_('Total document versions at each month'),
func=total_document_version_per_month,
minute='0'
klass=StatisticLineChart,
label=_('Total document versions at each month'),
minute='0',
slug='total-document-versions-at-each-month'
)
namespace.add_statistic(
klass=StatisticLineChart,
slug='total-document-pages-at-each-month',
label=_('Total document pages at each month'),
func=total_document_page_per_month,
minute='0'
klass=StatisticLineChart,
label=_('Total document pages at each month'),
minute='0',
slug='total-document-pages-at-each-month'
)