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

Replace get_object_list() with self.object_list

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-12 01:25:53 -04:00
parent 2d819e64c9
commit 4617afafb2
17 changed files with 40 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/authentication/views.py
View File

@@ -148,7 +148,7 @@ class UserSetPasswordView(MultipleObjectFormActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'submit_label': _('Submit'),
@@ -170,7 +170,7 @@ class UserSetPasswordView(MultipleObjectFormActionView):
return result
def get_form_extra_kwargs(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {}
if queryset:
result['user'] = queryset.first()

8
mayan/apps/cabinets/views.py
View File

@@ -211,7 +211,7 @@ class DocumentAddToCabinetView(MultipleObjectFormActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'submit_label': _('Add'),
@@ -237,7 +237,7 @@ class DocumentAddToCabinetView(MultipleObjectFormActionView):
return result
def get_form_extra_kwargs(self):
queryset = self.get_object_list()
queryset = self.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_object_list()
queryset = self.object_list
result = {
'submit_label': _('Remove'),
@@ -327,7 +327,7 @@ class DocumentRemoveFromCabinetView(MultipleObjectFormActionView):
return result
def get_form_extra_kwargs(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'help_text': _(
'Cabinets from which the selected documents will be removed.'

10
mayan/apps/common/tests/base.py
View File

@@ -10,17 +10,15 @@ from mayan.apps.smart_settings.classes import Namespace
from .mixins import (
ClientMethodsTestCaseMixin, ContentTypeCheckTestCaseMixin,
DatabaseConversionMixin, ModelTestCaseMixin,
OpenFileCheckTestCaseMixin, RandomPrimaryKeyModelMonkeyPatchMixin,
SilenceLoggerTestCaseMixin, TempfileCheckTestCasekMixin,
TestViewTestCaseMixin
ModelTestCaseMixin, OpenFileCheckTestCaseMixin,
RandomPrimaryKeyModelMonkeyPatchMixin, SilenceLoggerTestCaseMixin,
TempfileCheckTestCasekMixin, TestViewTestCaseMixin
)
class BaseTestCase(
SilenceLoggerTestCaseMixin, RandomPrimaryKeyModelMonkeyPatchMixin,
DatabaseConversionMixin, ACLTestCaseMixin,
ModelTestCaseMixin, OpenFileCheckTestCaseMixin,
ACLTestCaseMixin, ModelTestCaseMixin, OpenFileCheckTestCaseMixin,
TempfileCheckTestCasekMixin, TestCase
):
"""

7
mayan/apps/common/tests/mixins.py
View File

@@ -106,13 +106,6 @@ class ContentTypeCheckTestCaseMixin(object):
self.client = CustomClient()
class DatabaseConversionMixin(object):
def _test_database_conversion(self, *app_labels):
management.call_command(
'convertdb', *app_labels, force=True
)
class ModelTestCaseMixin(object):
def _model_instance_to_dictionary(self, instance):
return instance._meta.model._default_manager.filter(

10
mayan/apps/common/tests/test_models.py
View File

@@ -1,10 +0,0 @@
from __future__ import unicode_literals
from mayan.apps.common.tests import BaseTestCase
from mayan.apps.user_management.tests.mixins import UserTestMixin
class UserLocaleProfileTestCase(UserTestMixin, BaseTestCase):
def test_natural_keys(self):
self._create_test_user()
self._test_database_conversion('auth', 'common')

2
mayan/apps/document_parsing/views.py
View File

@@ -109,7 +109,7 @@ class DocumentSubmitView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'title': ungettext(

4
mayan/apps/documents/tests/test_models.py
View File

@@ -22,10 +22,6 @@ from .mixins import DocumentTestMixin
class DocumentTestCase(DocumentTestMixin, BaseTestCase):
def test_natural_keys(self):
self.test_document.pages.first().generate_image()
self._test_database_conversion('documents')
def test_document_creation(self):
self.assertEqual(self.test_document_type.label, TEST_DOCUMENT_TYPE_LABEL)

6
mayan/apps/documents/views/document_views.py
View File

@@ -111,7 +111,7 @@ class DocumentDocumentTypeEditView(MultipleObjectFormActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'submit_label': _('Change'),
@@ -439,7 +439,7 @@ class DocumentUpdatePageCountView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'title': ungettext(
@@ -490,7 +490,7 @@ class DocumentTransformationsClearView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'title': ungettext(

4
mayan/apps/documents/views/favorite_document_views.py
View File

@@ -51,7 +51,7 @@ class FavoriteAddView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
return {
'submit_label': _('Add'),
@@ -81,7 +81,7 @@ class FavoriteRemoveView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
return {
'submit_label': _('Remove'),

6
mayan/apps/documents/views/trashed_document_views.py
View File

@@ -41,7 +41,7 @@ class DocumentTrashView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'title': ungettext(
@@ -89,7 +89,7 @@ class TrashedDocumentDeleteView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'title': ungettext(
@@ -149,7 +149,7 @@ class TrashedDocumentRestoreView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'title': ungettext(

2
mayan/apps/file_metadata/views.py
View File

@@ -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_object_list()
queryset = self.object_list
result = {
'title': ungettext(

2
mayan/apps/mailer/views.py
View File

@@ -55,7 +55,7 @@ class MailDocumentView(MultipleObjectFormActionView):
title_document = 'Email document: %s'
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'submit_icon_class': icon_mail_document_submit,

20
mayan/apps/metadata/views.py
View File

@@ -58,7 +58,7 @@ class DocumentMetadataAddView(MultipleObjectFormActionView):
DocumentMetadataAddView, self
).dispatch(request, *args, **kwargs)
queryset = self.get_object_list()
queryset = self.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_object_list()
queryset = self.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_object_list()
queryset = self.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_object_list()
queryset = self.object_list
result = {}
@@ -226,7 +226,7 @@ class DocumentMetadataEditView(MultipleObjectFormActionView):
DocumentMetadataEditView, self
).dispatch(request, *args, **kwargs)
queryset = self.get_object_list()
queryset = self.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_object_list()
queryset = self.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_object_list()
queryset = self.object_list
id_list = ','.join(
map(
@@ -329,7 +329,7 @@ class DocumentMetadataEditView(MultipleObjectFormActionView):
return result
def get_initial(self):
queryset = self.get_object_list()
queryset = self.object_list
metadata_dict = {}
initial = []
@@ -468,7 +468,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView):
def form_valid(self, form):
result = super(DocumentMetadataRemoveView, self).form_valid(form=form)
queryset = self.get_object_list()
queryset = self.object_list
if self.action_count == 1:
return HttpResponseRedirect(
@@ -498,7 +498,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView):
return result
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'form_display_mode_table': True,

2
mayan/apps/ocr/views.py
View File

@@ -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_object_list()
queryset = self.object_list
result = {
'title': ungettext(

14
mayan/apps/tags/views.py
View File

@@ -41,7 +41,7 @@ class TagAttachActionView(MultipleObjectFormActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'submit_label': _('Attach'),
@@ -65,7 +65,7 @@ class TagAttachActionView(MultipleObjectFormActionView):
return result
def get_form_extra_kwargs(self):
queryset = self.get_object_list()
queryset = self.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_object_list()
queryset = self.object_list
if queryset.count() == 1:
return reverse(
viewname='tags:document_tag_list', kwargs={
@@ -148,7 +148,7 @@ class TagDeleteActionView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'message': _('Will be removed from all documents.'),
@@ -291,7 +291,7 @@ class TagRemoveActionView(MultipleObjectFormActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'submit_icon_class': icon_document_tag_remove_submit,
@@ -316,7 +316,7 @@ class TagRemoveActionView(MultipleObjectFormActionView):
return result
def get_form_extra_kwargs(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'help_text': _('Tags to be removed.'),
'permission': permission_tag_remove,
@@ -334,7 +334,7 @@ class TagRemoveActionView(MultipleObjectFormActionView):
return result
def get_post_action_redirect(self):
queryset = self.get_object_list()
queryset = self.object_list
if queryset.count() == 1:
return reverse(
viewname='tags:document_tag_list', kwargs={

11
mayan/apps/user_management/tests/test_models.py
View File

@@ -1,11 +0,0 @@
from __future__ import unicode_literals
from mayan.apps.common.tests import BaseTestCase
from .mixins import UserTestMixin
class UserTestCase(UserTestMixin, BaseTestCase):
def test_natural_keys(self):
self._create_test_user()
self._test_database_conversion('auth', 'user_management')

2
mayan/apps/user_management/views.py
View File

@@ -176,7 +176,7 @@ class UserDeleteView(MultipleObjectConfirmActionView):
)
def get_extra_context(self):
queryset = self.get_object_list()
queryset = self.object_list
result = {
'title': ungettext(