Remove PreserveGetQuerySet mixin. Update SingleObjectList and
MultipleObjectFormActionView views to use a new get_object_list method. Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import logging
|
||||
|
||||
from django.core.files.base import File
|
||||
from documents.models import DocumentType
|
||||
from documents.permissions import (
|
||||
@@ -140,12 +142,14 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
|
||||
'form-MAX_NUM_FORMS': '',
|
||||
}, follow=True
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
self.assertEqual(len(self.document.metadata.all()), 1)
|
||||
|
||||
def test_metadata_remove_view_with_permission(self):
|
||||
# Silence unrelated logging
|
||||
logging.getLogger('navigation.classes').setLevel(logging.CRITICAL)
|
||||
|
||||
self.login_user()
|
||||
|
||||
document_metadata = self.document.metadata.create(
|
||||
|
||||
@@ -359,7 +359,7 @@ class DocumentMetadataListView(SingleObjectListView):
|
||||
'title': _('Metadata for document: %s') % document,
|
||||
}
|
||||
|
||||
def get_queryset(self):
|
||||
def get_object_list(self):
|
||||
return self.get_document().metadata.all()
|
||||
|
||||
|
||||
@@ -545,9 +545,6 @@ class MetadataTypeEditView(SingleObjectEditView):
|
||||
class MetadataTypeListView(SingleObjectListView):
|
||||
view_permission = permission_metadata_type_view
|
||||
|
||||
def get_queryset(self):
|
||||
return MetadataType.objects.all()
|
||||
|
||||
def get_extra_context(self):
|
||||
return {
|
||||
'extra_columns': (
|
||||
@@ -560,6 +557,9 @@ class MetadataTypeListView(SingleObjectListView):
|
||||
'title': _('Metadata types'),
|
||||
}
|
||||
|
||||
def get_object_list(self):
|
||||
return MetadataType.objects.all()
|
||||
|
||||
|
||||
class SetupDocumentTypeMetadataTypes(FormView):
|
||||
form_class = DocumentTypeMetadataTypeRelationshipFormSet
|
||||
|
||||
Reference in New Issue
Block a user