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

PEP8 Cleanups.

Browse Source
This commit is contained in:
Roberto Rosario
2015-08-24 20:55:45 -04:00
parent f54c0d5058
commit 7392e80fc2
39 changed files with 1376 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/documents/migrations/0001_initial.py
+559 -36
View File
File diff suppressed because one or more lines are too long
mayan/apps/documents/migrations/0004_auto_20150616_1930.py
+17 -4
View File
@@ -13,18 +13,31 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='document',
options={'ordering': ('-date_added',), 'verbose_name': 'Document', 'verbose_name_plural': 'Documents'},
options={
'ordering': ('-date_added',), 'verbose_name': 'Document',
'verbose_name_plural': 'Documents'
},
),
migrations.AlterModelOptions(
name='documentpage',
options={'ordering': ('page_number',), 'verbose_name': 'Document page', 'verbose_name_plural': 'Document pages'},
options={
'ordering': ('page_number',), 'verbose_name': 'Document page',
'verbose_name_plural': 'Document pages'
},
),
migrations.AlterModelOptions(
name='documenttype',
options={'ordering': ('name',), 'verbose_name': 'Document type', 'verbose_name_plural': 'Documents types'},
options={
'ordering': ('name',), 'verbose_name': 'Document type',
'verbose_name_plural': 'Documents types'
},
),
migrations.AlterModelOptions(
name='documenttypefilename',
options={'ordering': ('filename',), 'verbose_name': 'Document type quick rename filename', 'verbose_name_plural': 'Document types quick rename filenames'},
options={
'ordering': ('filename',),
'verbose_name': 'Document type quick rename filename',
'verbose_name_plural': 'Document types quick rename filenames'
},
),
]
mayan/apps/documents/migrations/0011_auto_20150704_0508.py
+23 -5
View File
@@ -14,31 +14,49 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='documenttype',
name='delete_time_period',
field=models.PositiveIntegerField(default=30, verbose_name='Delete time period'),
field=models.PositiveIntegerField(
default=30, verbose_name='Delete time period'
),
preserve_default=True,
),
migrations.AddField(
model_name='documenttype',
name='delete_time_unit',
field=models.CharField(default='days', max_length=8, verbose_name='Delete time unit', choices=[('days', 'Days'), ('hours', 'Hours'), ('minutes', 'Minutes'), ('seconds', 'Seconds')]),
field=models.CharField(
default='days', max_length=8, verbose_name='Delete time unit',
choices=[
('days', 'Days'), ('hours', 'Hours'),
('minutes', 'Minutes'), ('seconds', 'Seconds')
]
),
preserve_default=True,
),
migrations.AddField(
model_name='documenttype',
name='trash_time_period',
field=models.PositiveIntegerField(null=True, verbose_name='Trash time period', blank=True),
field=models.PositiveIntegerField(
null=True, verbose_name='Trash time period', blank=True
),
preserve_default=True,
),
migrations.AddField(
model_name='documenttype',
name='trash_time_unit',
field=models.CharField(blank=True, max_length=8, null=True, verbose_name='Trash time unit', choices=[('days', 'Days'), ('hours', 'Hours'), ('minutes', 'Minutes'), ('seconds', 'Seconds')]),
field=models.CharField(
blank=True, max_length=8, null=True,
verbose_name='Trash time unit', choices=[
('days', 'Days'), ('hours', 'Hours'),
('minutes', 'Minutes'), ('seconds', 'Seconds')
]
),
preserve_default=True,
),
migrations.AlterField(
model_name='document',
name='deleted_date_time',
field=models.DateTimeField(verbose_name='Date and time trashed', blank=True),
field=models.DateTimeField(
verbose_name='Date and time trashed', blank=True
),
preserve_default=True,
),
]
mayan/apps/documents/migrations/0012_auto_20150705_0347.py
+27 -5
View File
@@ -14,31 +14,53 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='document',
name='deleted_date_time',
field=models.DateTimeField(null=True, verbose_name='Date and time trashed', blank=True),
field=models.DateTimeField(
null=True, verbose_name='Date and time trashed', blank=True
),
preserve_default=True,
),
migrations.AlterField(
model_name='documenttype',
name='delete_time_period',
field=models.PositiveIntegerField(default=30, help_text='Amount of time after which documents of this type in the trash will be deleted.', verbose_name='Delete time period'),
field=models.PositiveIntegerField(
default=30, help_text='Amount of time after which documents '
'of this type in the trash will be deleted.',
verbose_name='Delete time period'
),
preserve_default=True,
),
migrations.AlterField(
model_name='documenttype',
name='delete_time_unit',
field=models.CharField(default='days', max_length=8, verbose_name='Delete time unit', choices=[('days', 'Days'), ('hours', 'Hours'), ('minutes', 'Minutes')]),
field=models.CharField(
default='days', max_length=8, verbose_name='Delete time unit',
choices=[
('days', 'Days'), ('hours', 'Hours'),
('minutes', 'Minutes')
]
),
preserve_default=True,
),
migrations.AlterField(
model_name='documenttype',
name='trash_time_period',
field=models.PositiveIntegerField(help_text='Amount of time after which documents of this type will be moved to the trash.', null=True, verbose_name='Trash time period', blank=True),
field=models.PositiveIntegerField(
help_text='Amount of time after which documents of this type '
'will be moved to the trash.', null=True,
verbose_name='Trash time period', blank=True
),
preserve_default=True,
),
migrations.AlterField(
model_name='documenttype',
name='trash_time_unit',
field=models.CharField(blank=True, max_length=8, null=True, verbose_name='Trash time unit', choices=[('days', 'Days'), ('hours', 'Hours'), ('minutes', 'Minutes')]),
field=models.CharField(
blank=True, max_length=8, null=True,
verbose_name='Trash time unit', choices=[
('days', 'Days'), ('hours', 'Hours'),
('minutes', 'Minutes')
]
),
preserve_default=True,
),
]
mayan/apps/documents/migrations/0014_auto_20150708_0107.py
+4 -1
View File
@@ -13,7 +13,10 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='documenttype',
options={'ordering': ('label',), 'verbose_name': 'Document type', 'verbose_name_plural': 'Documents types'},
options={
'ordering': ('label',), 'verbose_name': 'Document type',
'verbose_name_plural': 'Documents types'
},
),
migrations.RenameField(
model_name='documenttype',
mayan/apps/documents/serializers.py
+18 -8
View File
@@ -40,7 +40,9 @@ class DocumentPageSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
extra_kwargs = {
'url': {'view_name': 'rest_api:documentpage-detail'},
'document_version': {'view_name': 'rest_api:documentversion-detail'}
'document_version': {
'view_name': 'rest_api:documentversion-detail'
}
}
model = DocumentPage
@@ -68,7 +70,9 @@ class DocumentTypeSerializer(serializers.HyperlinkedModelSerializer):
class DocumentVersionSerializer(serializers.HyperlinkedModelSerializer):
pages = DocumentPageSerializer(many=True, required=False, read_only=True)
revert = serializers.HyperlinkedIdentityField(view_name='rest_api:documentversion-revert')
revert = serializers.HyperlinkedIdentityField(
view_name='rest_api:documentversion-revert'
)
class Meta:
extra_kwargs = {
@@ -103,7 +107,9 @@ class NewDocumentVersionSerializer(serializers.Serializer):
class DeletedDocumentSerializer(serializers.HyperlinkedModelSerializer):
document_type_label = serializers.SerializerMethodField()
restore = serializers.HyperlinkedIdentityField(view_name='rest_api:deleteddocument-restore')
restore = serializers.HyperlinkedIdentityField(
view_name='rest_api:deleteddocument-restore'
)
def get_document_type_label(self, instance):
return instance.document_type.label
@@ -141,9 +147,9 @@ class DocumentSerializer(serializers.HyperlinkedModelSerializer):
'url': {'view_name': 'rest_api:document-detail'}
}
fields = (
'date_added', 'description', 'document_type', 'document_type_label',
'id', 'label', 'language', 'latest_version', 'url', 'uuid',
'versions',
'date_added', 'description', 'document_type',
'document_type_label', 'id', 'label', 'language',
'latest_version', 'url', 'uuid', 'versions',
)
model = Document
@@ -155,8 +161,12 @@ class NewDocumentSerializer(serializers.ModelSerializer):
document = Document.objects.create(
description=self.validated_data.get('description', ''),
document_type=self.validated_data['document_type'],
label=self.validated_data.get('label', unicode(self.validated_data['file'])),
language=self.validated_data.get('language', setting_language.value)
label=self.validated_data.get(
'label', unicode(self.validated_data['file'])
),
language=self.validated_data.get(
'language', setting_language.value
)
)
document.save(_user=_user)
mayan/apps/documents/widgets.py
+5 -2
View File
@@ -100,7 +100,9 @@ def document_html_widget(document_page, click_view=None, click_view_arguments=No
alt_text = _('Document page image')
if not document_page:
return mark_safe('<span class="fa-stack fa-lg"><i class="fa fa-file-o fa-stack-2x"></i><i class="fa fa-question fa-stack-1x text-danger"></i></span>')
return mark_safe(
'<span class="fa-stack fa-lg"><i class="fa fa-file-o fa-stack-2x"></i><i class="fa fa-question fa-stack-1x text-danger"></i></span>'
)
document = document_page.document
@@ -118,7 +120,8 @@ def document_html_widget(document_page, click_view=None, click_view_arguments=No
query_string = urlencode(query_dict)
preview_view = '%s?%s' % (
reverse('rest_api:documentpage-image', args=(document_page.pk,)), query_string
reverse('rest_api:documentpage-image', args=(document_page.pk,)),
query_string
)
result.append(