PEP8 cleanups.
This commit is contained in:
@@ -71,10 +71,3 @@ class Comment(models.Model):
|
|||||||
ordering = ('-submit_date',)
|
ordering = ('-submit_date',)
|
||||||
verbose_name = _('Comment')
|
verbose_name = _('Comment')
|
||||||
verbose_name_plural = _('Comments')
|
verbose_name_plural = _('Comments')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,20 @@ from django.conf.urls import patterns, url
|
|||||||
|
|
||||||
urlpatterns = patterns(
|
urlpatterns = patterns(
|
||||||
'document_signatures.views',
|
'document_signatures.views',
|
||||||
url(r'^verify/(?P<document_pk>\d+)/$', 'document_verify', name='document_verify'),
|
url(
|
||||||
url(r'^upload/signature/(?P<document_pk>\d+)/$', 'document_signature_upload', name='document_signature_upload'),
|
r'^verify/(?P<document_pk>\d+)/$', 'document_verify',
|
||||||
url(r'^download/signature/(?P<document_pk>\d+)/$', 'document_signature_download', name='document_signature_download'),
|
name='document_verify'
|
||||||
url(r'^document/(?P<document_pk>\d+)/signature/delete/$', 'document_signature_delete', name='document_signature_delete'),
|
),
|
||||||
|
url(
|
||||||
|
r'^upload/signature/(?P<document_pk>\d+)/$',
|
||||||
|
'document_signature_upload', name='document_signature_upload'
|
||||||
|
),
|
||||||
|
url(
|
||||||
|
r'^download/signature/(?P<document_pk>\d+)/$',
|
||||||
|
'document_signature_download', name='document_signature_download'
|
||||||
|
),
|
||||||
|
url(
|
||||||
|
r'^document/(?P<document_pk>\d+)/signature/delete/$',
|
||||||
|
'document_signature_delete', name='document_signature_delete'
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ class DocumentPageSerializer(serializers.HyperlinkedModelSerializer):
|
|||||||
'url': {'view_name': 'rest_api:documentpage-detail'},
|
'url': {'view_name': 'rest_api:documentpage-detail'},
|
||||||
'document_version': {
|
'document_version': {
|
||||||
'view_name': 'rest_api:documentversion-detail'
|
'view_name': 'rest_api:documentversion-detail'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
model = DocumentPage
|
model = DocumentPage
|
||||||
|
|
||||||
|
|||||||
@@ -968,7 +968,10 @@ class DocumentTypeDeleteView(SingleObjectDeleteView):
|
|||||||
|
|
||||||
|
|
||||||
class DocumentTypeEditView(SingleObjectEditView):
|
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
|
model = DocumentType
|
||||||
post_action_redirect = reverse_lazy('documents:document_type_list')
|
post_action_redirect = reverse_lazy('documents:document_type_list')
|
||||||
view_permission = permission_document_type_edit
|
view_permission = permission_document_type_edit
|
||||||
@@ -981,7 +984,10 @@ class DocumentTypeEditView(SingleObjectEditView):
|
|||||||
|
|
||||||
|
|
||||||
class DocumentTypeCreateView(SingleObjectCreateView):
|
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
|
model = DocumentType
|
||||||
post_action_redirect = reverse_lazy('documents:document_type_list')
|
post_action_redirect = reverse_lazy('documents:document_type_list')
|
||||||
view_permission = permission_document_type_create
|
view_permission = permission_document_type_create
|
||||||
@@ -1107,13 +1113,19 @@ def document_clear_image_cache(request):
|
|||||||
class DocumentVersionListView(SingleObjectListView):
|
class DocumentVersionListView(SingleObjectListView):
|
||||||
def dispatch(self, request, *args, **kwargs):
|
def dispatch(self, request, *args, **kwargs):
|
||||||
try:
|
try:
|
||||||
Permission.check_permissions(request.user, (permission_document_view,))
|
Permission.check_permissions(
|
||||||
|
request.user, (permission_document_view,)
|
||||||
|
)
|
||||||
except PermissionDenied:
|
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)
|
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):
|
def get_document(self):
|
||||||
return get_object_or_404(Document, pk=self.kwargs['pk'])
|
return get_object_or_404(Document, pk=self.kwargs['pk'])
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class MetadataTestCase(TestCase):
|
|||||||
document_metadata.save()
|
document_metadata.save()
|
||||||
|
|
||||||
# Should not return error
|
# Should not return error
|
||||||
document_metadata.value=TEST_CORRECT_LOOKUP_VALUE
|
document_metadata.value = TEST_CORRECT_LOOKUP_VALUE
|
||||||
document_metadata.full_clean()
|
document_metadata.full_clean()
|
||||||
document_metadata.save()
|
document_metadata.save()
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@ class MetadataTestCase(TestCase):
|
|||||||
document_metadata.save()
|
document_metadata.save()
|
||||||
|
|
||||||
# Should not return error
|
# Should not return error
|
||||||
document_metadata.value=TEST_VALID_DATE
|
document_metadata.value = TEST_VALID_DATE
|
||||||
document_metadata.full_clean()
|
document_metadata.full_clean()
|
||||||
document_metadata.save()
|
document_metadata.save()
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@ class MetadataTestCase(TestCase):
|
|||||||
document_metadata.save()
|
document_metadata.save()
|
||||||
|
|
||||||
# Should not return error
|
# Should not return error
|
||||||
document_metadata.value=TEST_VALID_DATE
|
document_metadata.value = TEST_VALID_DATE
|
||||||
document_metadata.full_clean()
|
document_metadata.full_clean()
|
||||||
document_metadata.save()
|
document_metadata.save()
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ from __future__ import unicode_literals
|
|||||||
|
|
||||||
from django.template import Library
|
from django.template import Library
|
||||||
|
|
||||||
from common.utils import return_attrib
|
|
||||||
|
|
||||||
from ..classes import Menu, SourceColumn
|
from ..classes import Menu, SourceColumn
|
||||||
from ..forms import MultiItemForm
|
from ..forms import MultiItemForm
|
||||||
|
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ def user_set_password(request, user_id=None, user_id_list=None):
|
|||||||
except Exception as exception:
|
except Exception as exception:
|
||||||
messages.error(
|
messages.error(
|
||||||
request, _(
|
request, _(
|
||||||
'Error reseting password for user "%(user)s": %(error)s'
|
'Error reseting password for user "%(user)s": %(error)s'
|
||||||
) % {
|
) % {
|
||||||
'user': user, 'error': exception
|
'user': user, 'error': exception
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user