diff --git a/mayan/apps/acls/api_views.py b/mayan/apps/acls/api_views.py index 6dd0f1ec4f..fec0fbdbb1 100644 --- a/mayan/apps/acls/api_views.py +++ b/mayan/apps/acls/api_views.py @@ -4,7 +4,7 @@ from rest_framework import status from rest_framework.decorators import action from rest_framework.response import Response -from mayan.apps.common.mixins import ContentTypeViewMixin, ExternalObjectMixin +from mayan.apps.common.mixins import ContentTypeViewMixin from mayan.apps.permissions.serializers import ( PermissionSerializer, RolePermissionAddRemoveSerializer ) diff --git a/mayan/apps/django_gpg/urls.py b/mayan/apps/django_gpg/urls.py index 915373e5b3..9652877e6a 100644 --- a/mayan/apps/django_gpg/urls.py +++ b/mayan/apps/django_gpg/urls.py @@ -45,7 +45,6 @@ urlpatterns = [ ) ] - api_router_entries = ( {'prefix': r'keys', 'viewset': KeyAPIViewSet, 'basename': 'key'}, ) diff --git a/mayan/apps/sources/apps.py b/mayan/apps/sources/apps.py index b32bb9e934..a66e4b440e 100644 --- a/mayan/apps/sources/apps.py +++ b/mayan/apps/sources/apps.py @@ -6,7 +6,7 @@ from kombu import Exchange, Queue from mayan.apps.common import ( MayanAppConfig, MissingItem, menu_list_facet, menu_object, menu_secondary, - menu_setup, menu_secondary + menu_setup ) from mayan.apps.common.signals import post_initial_setup, post_upgrade from mayan.apps.common.widgets import TwoStateWidget diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 21ec981473..a81f625371 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -13,7 +13,6 @@ from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls.models import AccessControlList -from mayan.apps.checkouts.models import NewVersionBlock from mayan.apps.common import menu_facet from mayan.apps.common.mixins import ExternalObjectMixin, ListModeMixin from mayan.apps.common.models import SharedUploadedFile diff --git a/mayan/apps/tags/api_views.py b/mayan/apps/tags/api_views.py index 1dfa1eace3..598f96d92d 100644 --- a/mayan/apps/tags/api_views.py +++ b/mayan/apps/tags/api_views.py @@ -1,16 +1,10 @@ from __future__ import absolute_import, unicode_literals -from drf_yasg.utils import swagger_auto_schema - -from rest_framework import generics, serializers, status, routers, viewsets +from rest_framework import status from rest_framework.decorators import action -from rest_framework.exceptions import ValidationError from rest_framework.response import Response -from mayan.apps.common.mixins import ExternalObjectMixin -from mayan.apps.documents.api_views import DocumentViewSet from mayan.apps.documents.models import Document -from mayan.apps.documents.permissions import permission_document_view from mayan.apps.documents.serializers import DocumentSerializer from mayan.apps.rest_api.viewsets import ( MayanAPIGenericViewSet, MayanAPIModelViewSet @@ -28,7 +22,7 @@ from .serializers import ( class TagAPIViewSet(MayanAPIModelViewSet): - lookup_url_kwarg='tag_id' + lookup_url_kwarg = 'tag_id' object_permission_map = { 'destroy': permission_tag_delete, 'document_attach': permission_tag_attach, @@ -93,9 +87,8 @@ class TagAPIViewSet(MayanAPIModelViewSet): ) - class DocumentTagAPIViewSet(MayanAPIGenericViewSet): - lookup_url_kwarg='document_id' + lookup_url_kwarg = 'document_id' object_permission_map = { 'tag_attach': permission_tag_attach, 'tag_list': permission_tag_view, diff --git a/mayan/apps/tags/forms.py b/mayan/apps/tags/forms.py index 99a85db7b4..dbf6243438 100644 --- a/mayan/apps/tags/forms.py +++ b/mayan/apps/tags/forms.py @@ -1,15 +1,9 @@ from __future__ import absolute_import, unicode_literals -from django import forms from django.utils.translation import ugettext_lazy as _ -from mayan.apps.acls.models import AccessControlList from mayan.apps.common.forms import FilteredSelectionForm -from .models import Tag -from .permissions import permission_tag_view -from .widgets import TagFormWidget - class TagMultipleSelectionForm(FilteredSelectionForm): class Media: diff --git a/mayan/apps/tags/methods.py b/mayan/apps/tags/methods.py index f7d7aabe11..958ac3cc69 100644 --- a/mayan/apps/tags/methods.py +++ b/mayan/apps/tags/methods.py @@ -5,7 +5,6 @@ from django.db import transaction from django.utils.translation import ugettext_lazy as _ from .events import event_tag_attach, event_tag_remove -from .permissions import permission_tag_view def method_document_tags_attach(self, queryset, _user=None): diff --git a/mayan/apps/tags/serializers.py b/mayan/apps/tags/serializers.py index 75b58f0684..5985f58324 100644 --- a/mayan/apps/tags/serializers.py +++ b/mayan/apps/tags/serializers.py @@ -1,15 +1,10 @@ from __future__ import absolute_import, unicode_literals -from django.core.exceptions import ImproperlyConfigured from django.utils.translation import ugettext_lazy as _ from rest_framework import serializers -from rest_framework.generics import get_object_or_404 -from rest_framework.reverse import reverse -from mayan.apps.acls.models import AccessControlList from mayan.apps.documents.models import Document -from mayan.apps.documents.serializers import DocumentSerializer from mayan.apps.rest_api.mixins import ExternalObjectListSerializerMixin from .models import Tag @@ -64,7 +59,7 @@ class TagSerializer(serializers.HyperlinkedModelSerializer): } fields = ( 'color', 'document_attach_url', 'document_list_url', - 'document_remove_url','label', 'id', 'url' + 'document_remove_url', 'label', 'id', 'url' ) model = Tag diff --git a/mayan/apps/tags/tests/test_events.py b/mayan/apps/tags/tests/test_events.py index 46fcce25e8..5810fa9255 100644 --- a/mayan/apps/tags/tests/test_events.py +++ b/mayan/apps/tags/tests/test_events.py @@ -10,6 +10,7 @@ from ..permissions import permission_tag_create, permission_tag_edit from .mixins import TagTestMixin + #TODO: Add tests for event_tag_remove and event_tag_attach class TagEventsTestCase(TagTestMixin, GenericDocumentViewTestCase): def setUp(self): diff --git a/mayan/apps/tags/tests/test_indexing.py b/mayan/apps/tags/tests/test_indexing.py index d9def591de..686adb87a4 100644 --- a/mayan/apps/tags/tests/test_indexing.py +++ b/mayan/apps/tags/tests/test_indexing.py @@ -5,8 +5,6 @@ from mayan.apps.documents.tests import DocumentTestMixin from mayan.apps.document_indexing.models import Index, IndexInstanceNode from mayan.apps.document_indexing.tests.literals import TEST_INDEX_LABEL -from ..models import Tag - from .literals import ( TEST_TAG_INDEX_HAS_TAG, TEST_TAG_INDEX_NO_TAG, TEST_TAG_INDEX_NODE_TEMPLATE ) diff --git a/mayan/apps/tags/tests/test_wizard_steps.py b/mayan/apps/tags/tests/test_wizard_steps.py index 9acfd0971b..5567b6b558 100644 --- a/mayan/apps/tags/tests/test_wizard_steps.py +++ b/mayan/apps/tags/tests/test_wizard_steps.py @@ -10,9 +10,7 @@ from mayan.apps.sources.tests.literals import ( TEST_SOURCE_LABEL, TEST_SOURCE_UNCOMPRESS_N ) -from ..models import Tag -from .literals import TEST_TAG_COLOR, TEST_TAG_LABEL from .mixins import TagTestMixin diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index bee0d267ce..ee45595932 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals import logging from django.contrib import messages -from django.shortcuts import get_object_or_404, reverse +from django.shortcuts import reverse from django.template import RequestContext from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _, ungettext @@ -16,7 +16,6 @@ from mayan.apps.common.generics import ( from mayan.apps.common.mixins import ExternalObjectMixin from mayan.apps.documents.models import Document from mayan.apps.documents.views import DocumentListView -from mayan.apps.documents.permissions import permission_document_view from .forms import TagMultipleSelectionForm from .icons import (