diff --git a/mayan/apps/document_comments/models.py b/mayan/apps/document_comments/models.py index 991a8c7085..24a317e132 100644 --- a/mayan/apps/document_comments/models.py +++ b/mayan/apps/document_comments/models.py @@ -71,10 +71,3 @@ class Comment(models.Model): ordering = ('-submit_date',) verbose_name = _('Comment') verbose_name_plural = _('Comments') - - - - - - - diff --git a/mayan/apps/document_signatures/urls.py b/mayan/apps/document_signatures/urls.py index f2b4e0c87d..408b385fae 100644 --- a/mayan/apps/document_signatures/urls.py +++ b/mayan/apps/document_signatures/urls.py @@ -4,8 +4,20 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'document_signatures.views', - url(r'^verify/(?P\d+)/$', 'document_verify', name='document_verify'), - url(r'^upload/signature/(?P\d+)/$', 'document_signature_upload', name='document_signature_upload'), - url(r'^download/signature/(?P\d+)/$', 'document_signature_download', name='document_signature_download'), - url(r'^document/(?P\d+)/signature/delete/$', 'document_signature_delete', name='document_signature_delete'), + url( + r'^verify/(?P\d+)/$', 'document_verify', + name='document_verify' + ), + url( + r'^upload/signature/(?P\d+)/$', + 'document_signature_upload', name='document_signature_upload' + ), + url( + r'^download/signature/(?P\d+)/$', + 'document_signature_download', name='document_signature_download' + ), + url( + r'^document/(?P\d+)/signature/delete/$', + 'document_signature_delete', name='document_signature_delete' + ), ) diff --git a/mayan/apps/documents/serializers.py b/mayan/apps/documents/serializers.py index fec1a7fd12..911d878a5e 100644 --- a/mayan/apps/documents/serializers.py +++ b/mayan/apps/documents/serializers.py @@ -42,7 +42,7 @@ class DocumentPageSerializer(serializers.HyperlinkedModelSerializer): 'url': {'view_name': 'rest_api:documentpage-detail'}, 'document_version': { 'view_name': 'rest_api:documentversion-detail' - } + } } model = DocumentPage diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 4089c07f58..278ccd8874 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -968,7 +968,10 @@ class DocumentTypeDeleteView(SingleObjectDeleteView): class DocumentTypeEditView(SingleObjectEditView): - fields = ('label', 'trash_time_period', 'trash_time_unit', 'delete_time_period', 'delete_time_unit') + fields = ( + 'label', 'trash_time_period', 'trash_time_unit', 'delete_time_period', + 'delete_time_unit' + ) model = DocumentType post_action_redirect = reverse_lazy('documents:document_type_list') view_permission = permission_document_type_edit @@ -981,7 +984,10 @@ class DocumentTypeEditView(SingleObjectEditView): class DocumentTypeCreateView(SingleObjectCreateView): - fields = ('label', 'trash_time_period', 'trash_time_unit', 'delete_time_period', 'delete_time_unit') + fields = ( + 'label', 'trash_time_period', 'trash_time_unit', 'delete_time_period', + 'delete_time_unit' + ) model = DocumentType post_action_redirect = reverse_lazy('documents:document_type_list') view_permission = permission_document_type_create @@ -1107,13 +1113,19 @@ def document_clear_image_cache(request): class DocumentVersionListView(SingleObjectListView): def dispatch(self, request, *args, **kwargs): try: - Permission.check_permissions(request.user, (permission_document_view,)) + Permission.check_permissions( + request.user, (permission_document_view,) + ) except PermissionDenied: - AccessControlList.objects.check_access(permission_document_view, request.user, self.get_document()) + AccessControlList.objects.check_access( + permission_document_view, request.user, self.get_document() + ) self.get_document().add_as_recent_document_for_user(request.user) - return super(DocumentVersionListView, self).dispatch(request, *args, **kwargs) + return super( + DocumentVersionListView, self + ).dispatch(request, *args, **kwargs) def get_document(self): return get_object_or_404(Document, pk=self.kwargs['pk']) diff --git a/mayan/apps/metadata/tests/test_models.py b/mayan/apps/metadata/tests/test_models.py index 0a8bf9a508..ad4e6979c5 100644 --- a/mayan/apps/metadata/tests/test_models.py +++ b/mayan/apps/metadata/tests/test_models.py @@ -81,7 +81,7 @@ class MetadataTestCase(TestCase): document_metadata.save() # Should not return error - document_metadata.value=TEST_CORRECT_LOOKUP_VALUE + document_metadata.value = TEST_CORRECT_LOOKUP_VALUE document_metadata.full_clean() document_metadata.save() @@ -100,7 +100,7 @@ class MetadataTestCase(TestCase): document_metadata.save() # Should not return error - document_metadata.value=TEST_VALID_DATE + document_metadata.value = TEST_VALID_DATE document_metadata.full_clean() document_metadata.save() @@ -119,7 +119,7 @@ class MetadataTestCase(TestCase): document_metadata.save() # Should not return error - document_metadata.value=TEST_VALID_DATE + document_metadata.value = TEST_VALID_DATE document_metadata.full_clean() document_metadata.save() diff --git a/mayan/apps/navigation/templatetags/navigation_tags.py b/mayan/apps/navigation/templatetags/navigation_tags.py index 01f3b2bd32..b77995b390 100644 --- a/mayan/apps/navigation/templatetags/navigation_tags.py +++ b/mayan/apps/navigation/templatetags/navigation_tags.py @@ -2,8 +2,6 @@ from __future__ import unicode_literals from django.template import Library -from common.utils import return_attrib - from ..classes import Menu, SourceColumn from ..forms import MultiItemForm diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 0b0f46a434..1c6db980b8 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -220,7 +220,7 @@ def user_set_password(request, user_id=None, user_id_list=None): except Exception as exception: messages.error( request, _( - 'Error reseting password for user "%(user)s": %(error)s' + 'Error reseting password for user "%(user)s": %(error)s' ) % { 'user': user, 'error': exception }