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

Backport common mixin and generics improvements

Browse Source 
* Rename get_object_list to get_source_queryset.
* Add uniqueness validation to SingleObjectCreateView.
* Remove MultipleInstanceActionMixin.
* Backport MultipleObjectMixin improvements.
* Remove ObjectListPermissionFilterMixin.
* Add and improve tests.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-06 02:07:35 -04:00
parent 7181852c2d
commit 95a1df8072
72 changed files with 1330 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/documents/views/trashed_document_views.py
+9 -7
View File
@@ -41,11 +41,11 @@ class DocumentTrashView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.get_queryset()
result = {
'title': ungettext(
single='Move the selected document to the trash?',
singular='Move the selected document to the trash?',
plural='Move the selected documents to the trash?',
number=queryset.count()
)
@@ -72,7 +72,9 @@ class EmptyTrashCanView(ConfirmView):
kwargs={'trashed_document_id': deleted_document.pk}
)
messages.success(self.request, _('Trash emptied successfully'))
messages.success(
message=_('Trash emptied successfully'), request=self.request
)
class TrashedDocumentDeleteView(MultipleObjectConfirmActionView):
@@ -87,11 +89,11 @@ class TrashedDocumentDeleteView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.get_queryset()
result = {
'title': ungettext(
single='Delete the selected trashed document?',
singular='Delete the selected trashed document?',
plural='Delete the selected trashed documents?',
number=queryset.count()
)
@@ -147,11 +149,11 @@ class TrashedDocumentRestoreView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.get_queryset()
result = {
'title': ungettext(
single='Restore the selected trashed document?',
singular='Restore the selected trashed document?',
plural='Restore the selected trashed documents?',
number=queryset.count()
)