diff --git a/mayan/apps/cabinets/views.py b/mayan/apps/cabinets/views.py index d3225d643f..c9b35e30f0 100644 --- a/mayan/apps/cabinets/views.py +++ b/mayan/apps/cabinets/views.py @@ -211,7 +211,7 @@ class DocumentAddToCabinetView(MultipleObjectFormActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'submit_label': _('Add'), @@ -237,7 +237,7 @@ class DocumentAddToCabinetView(MultipleObjectFormActionView): return result def get_form_extra_kwargs(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'help_text': _( 'Cabinets to which the selected documents will be added.' @@ -301,7 +301,7 @@ class DocumentRemoveFromCabinetView(MultipleObjectFormActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'submit_label': _('Remove'), @@ -327,7 +327,7 @@ class DocumentRemoveFromCabinetView(MultipleObjectFormActionView): return result def get_form_extra_kwargs(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'help_text': _( 'Cabinets from which the selected documents will be removed.' diff --git a/mayan/apps/document_parsing/views.py b/mayan/apps/document_parsing/views.py index 89d4b2cbee..f25ca137cd 100644 --- a/mayan/apps/document_parsing/views.py +++ b/mayan/apps/document_parsing/views.py @@ -109,7 +109,7 @@ class DocumentSubmitView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py index 63bb37f972..4f957ffb92 100644 --- a/mayan/apps/documents/views/document_views.py +++ b/mayan/apps/documents/views/document_views.py @@ -111,14 +111,14 @@ class DocumentDocumentTypeEditView(MultipleObjectFormActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'submit_label': _('Change'), 'title': ungettext( - 'Change the type of the selected document', - 'Change the type of the selected documents', - queryset.count() + singular='Change the type of the selected document', + plurals='Change the type of the selected documents', + number=queryset.count() ) } @@ -439,13 +439,13 @@ class DocumentUpdatePageCountView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( - 'Recalculate the page count of the selected document?', - 'Recalculate the page count of the selected documents?', - queryset.count() + singular='Recalculate the page count of the selected document?', + plural='Recalculate the page count of the selected documents?', + number=queryset.count() ) } @@ -490,13 +490,13 @@ class DocumentTransformationsClearView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( - 'Clear all the page transformations for the selected document?', - 'Clear all the page transformations for the selected document?', - queryset.count() + singular='Clear all the page transformations for the selected document?', + plural='Clear all the page transformations for the selected document?', + number=queryset.count() ) } diff --git a/mayan/apps/documents/views/favorite_document_views.py b/mayan/apps/documents/views/favorite_document_views.py index 80a8859416..c86436d856 100644 --- a/mayan/apps/documents/views/favorite_document_views.py +++ b/mayan/apps/documents/views/favorite_document_views.py @@ -51,7 +51,7 @@ class FavoriteAddView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() return { 'submit_label': _('Add'), @@ -81,7 +81,7 @@ class FavoriteRemoveView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() return { 'submit_label': _('Remove'), diff --git a/mayan/apps/documents/views/trashed_document_views.py b/mayan/apps/documents/views/trashed_document_views.py index 74e22545dc..861edbb447 100644 --- a/mayan/apps/documents/views/trashed_document_views.py +++ b/mayan/apps/documents/views/trashed_document_views.py @@ -41,7 +41,7 @@ class DocumentTrashView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( @@ -89,7 +89,7 @@ class TrashedDocumentDeleteView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( @@ -149,7 +149,7 @@ class TrashedDocumentRestoreView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( diff --git a/mayan/apps/file_metadata/views.py b/mayan/apps/file_metadata/views.py index 8e5a3c6a6e..b1c3048663 100644 --- a/mayan/apps/file_metadata/views.py +++ b/mayan/apps/file_metadata/views.py @@ -81,7 +81,7 @@ class DocumentSubmitView(MultipleObjectConfirmActionView): success_message_plural = '%(count)d documents submitted to the file metadata queue.' def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( diff --git a/mayan/apps/mailer/views.py b/mayan/apps/mailer/views.py index d524828dd6..a1bb219194 100644 --- a/mayan/apps/mailer/views.py +++ b/mayan/apps/mailer/views.py @@ -55,15 +55,15 @@ class MailDocumentView(MultipleObjectFormActionView): title_document = 'Email document: %s' def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'submit_icon_class': icon_mail_document_submit, 'submit_label': _('Send'), 'title': ungettext( - self.title, - self.title_plural, - queryset.count() + singular=self.title, + plural=self.title_plural, + number=queryset.count() ) } diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 5f0f7f7341..35ca74defd 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -58,7 +58,7 @@ class DocumentMetadataAddView(MultipleObjectFormActionView): DocumentMetadataAddView, self ).dispatch(request, *args, **kwargs) - queryset = self.get_queryset() + queryset = self.get_object_list() for document in queryset: document.add_as_recent_document_for_user(request.user) @@ -76,7 +76,7 @@ class DocumentMetadataAddView(MultipleObjectFormActionView): def form_valid(self, form): result = super(DocumentMetadataAddView, self).form_valid(form=form) - queryset = self.get_queryset() + queryset = self.get_object_list() if self.action_count == 1: return HttpResponseRedirect( @@ -106,7 +106,7 @@ class DocumentMetadataAddView(MultipleObjectFormActionView): return result def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'submit_icon_class': icon_document_metadata_add, @@ -131,7 +131,7 @@ class DocumentMetadataAddView(MultipleObjectFormActionView): return result def get_form_extra_kwargs(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = {} @@ -226,7 +226,7 @@ class DocumentMetadataEditView(MultipleObjectFormActionView): DocumentMetadataEditView, self ).dispatch(request, *args, **kwargs) - queryset = self.get_queryset() + queryset = self.get_object_list() for document in queryset: document.add_as_recent_document_for_user(request.user) @@ -244,7 +244,7 @@ class DocumentMetadataEditView(MultipleObjectFormActionView): def form_valid(self, form): result = super(DocumentMetadataEditView, self).form_valid(form=form) - queryset = self.get_queryset() + queryset = self.get_object_list() if self.action_count == 1: return HttpResponseRedirect( @@ -275,7 +275,7 @@ class DocumentMetadataEditView(MultipleObjectFormActionView): return result def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() id_list = ','.join( map( @@ -329,7 +329,7 @@ class DocumentMetadataEditView(MultipleObjectFormActionView): return result def get_initial(self): - queryset = self.get_queryset() + queryset = self.get_object_list() metadata_dict = {} initial = [] @@ -451,7 +451,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView): DocumentMetadataRemoveView, self ).dispatch(request, *args, **kwargs) - queryset = self.get_queryset() + queryset = self.get_object_list() for document in queryset: document.add_as_recent_document_for_user(request.user) @@ -469,7 +469,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView): def form_valid(self, form): result = super(DocumentMetadataRemoveView, self).form_valid(form=form) - queryset = self.get_queryset() + queryset = self.get_object_list() if self.action_count == 1: return HttpResponseRedirect( @@ -499,7 +499,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView): return result def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'form_display_mode_table': True, @@ -525,7 +525,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView): return result def get_initial(self): - queryset = self.get_queryset() + queryset = self.get_object_list() metadata = {} for document in queryset: diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py index b447e927cf..c081ae89ad 100644 --- a/mayan/apps/ocr/views.py +++ b/mayan/apps/ocr/views.py @@ -73,7 +73,7 @@ class DocumentSubmitView(MultipleObjectConfirmActionView): success_message_plural = '%(count)d documents submitted to the OCR queue.' def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'title': ungettext( diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 104488e275..03fd71aaf5 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -41,7 +41,7 @@ class TagAttachActionView(MultipleObjectFormActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'submit_label': _('Attach'), @@ -65,7 +65,7 @@ class TagAttachActionView(MultipleObjectFormActionView): return result def get_form_extra_kwargs(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'help_text': _('Tags to be attached.'), 'permission': permission_tag_attach, @@ -85,7 +85,7 @@ class TagAttachActionView(MultipleObjectFormActionView): return result def get_post_action_redirect(self): - queryset = self.get_queryset() + queryset = self.get_object_list() if queryset.count() == 1: return reverse( viewname='tags:document_tag_list', kwargs={ @@ -146,7 +146,7 @@ class TagDeleteActionView(MultipleObjectConfirmActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'message': _('Will be removed from all documents.'), @@ -289,7 +289,7 @@ class TagRemoveActionView(MultipleObjectFormActionView): ) def get_extra_context(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'submit_icon_class': icon_document_tag_remove_submit, @@ -314,7 +314,7 @@ class TagRemoveActionView(MultipleObjectFormActionView): return result def get_form_extra_kwargs(self): - queryset = self.get_queryset() + queryset = self.get_object_list() result = { 'help_text': _('Tags to be removed.'), 'permission': permission_tag_remove, @@ -332,7 +332,7 @@ class TagRemoveActionView(MultipleObjectFormActionView): return result def get_post_action_redirect(self): - queryset = self.get_queryset() + queryset = self.get_object_list() if queryset.count() == 1: return reverse( viewname='tags:document_tag_list', kwargs={