Skip to content

Commit fffd88f

Browse files
tompollardtompollard
committed
Fix style
1 parent a32d9a3 commit fffd88f

File tree

1 file changed

+96
-92
lines changed

1 file changed

+96
-92
lines changed

‎physionet-django/console/views.py‎

Lines changed: 96 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,14 @@ def submitted_projects(request):
221221
except (ValueError, ActiveProject.DoesNotExist):
222222
pass
223223
return render(request, 'console/submitted_projects.html',
224-
{'assign_editor_form': assign_editor_form,
225-
'assignment_projects': assignment_projects,
226-
'decision_projects': decision_projects,
227-
'revision_projects': revision_projects,
228-
'copyedit_projects': copyedit_projects,
229-
'approval_projects': approval_projects,
230-
'publish_projects': publish_projects,
231-
'yesterday': yesterday})
224+
{'assign_editor_form': assign_editor_form,
225+
'assignment_projects': assignment_projects,
226+
'decision_projects': decision_projects,
227+
'revision_projects': revision_projects,
228+
'copyedit_projects': copyedit_projects,
229+
'approval_projects': approval_projects,
230+
'publish_projects': publish_projects,
231+
'yesterday': yesterday})
232232

233233

234234
@console_permission_required('project.change_activeproject')
@@ -265,12 +265,12 @@ def editor_home(request):
265265
except (ValueError, ActiveProject.DoesNotExist):
266266
pass
267267
return render(request, 'console/editor_home.html',
268-
{'decision_projects': decision_projects,
269-
'revision_projects': revision_projects,
270-
'copyedit_projects': copyedit_projects,
271-
'approval_projects': approval_projects,
272-
'publish_projects': publish_projects,
273-
'yesterday': yesterday, 'editor_home': True})
268+
{'decision_projects': decision_projects,
269+
'revision_projects': revision_projects,
270+
'copyedit_projects': copyedit_projects,
271+
'approval_projects': approval_projects,
272+
'publish_projects': publish_projects,
273+
'yesterday': yesterday, 'editor_home': True})
274274

275275

276276
def submission_info_redirect(request, project_slug):
@@ -387,7 +387,8 @@ def submission_info(request, project_slug):
387387

388388
LOGGER.info(f"Project root: {project_root}")
389389
LOGGER.info(f"File path: {file_unpack_form.cleaned_data['file_path']}")
390-
LOGGER.info(f"Full file path: {os.path.join(project_root, file_unpack_form.cleaned_data['file_path'])}")
390+
full_path = os.path.join(project_root, file_unpack_form.cleaned_data['file_path'])
391+
LOGGER.info(f"Full file path: {full_path}")
391392

392393
result = FileUnpacker.unpack_file(
393394
project_root=project_root,
@@ -399,7 +400,8 @@ def submission_info(request, project_slug):
399400
if result['success']:
400401
messages.success(
401402
request,
402-
f"Successfully unpacked {len(result['extracted_files'])} files to {result['extract_directory']}"
403+
f"Successfully unpacked {len(result['extracted_files'])} "
404+
f"files to {result['extract_directory']}"
403405
)
404406
# Reset form after successful unpacking
405407
file_unpack_form = forms.FileUnpackForm()
@@ -416,22 +418,22 @@ def submission_info(request, project_slug):
416418
messages.error(request, 'Invalid file unpacking submission. See errors below.')
417419

418420
return render(request, 'console/submission_info.html',
419-
{**submission_info_card_params(
420-
request,
421-
project,
422-
reassign_editor_form,
423-
embargo_form,
424-
internal_note_form,
425-
bulk_download=True,
426-
force_calculate=False,
427-
file_unpack_form=file_unpack_form
428-
),
429-
'copyedit_logs': copyedit_logs,
430-
'passphrase': passphrase,
431-
'anonymous_url': anonymous_url,
432-
'file_unpack_form': file_unpack_form,
433-
}
434-
)
421+
{**submission_info_card_params(
422+
request,
423+
project,
424+
reassign_editor_form,
425+
embargo_form,
426+
internal_note_form,
427+
bulk_download=True,
428+
force_calculate=False,
429+
file_unpack_form=file_unpack_form
430+
),
431+
'copyedit_logs': copyedit_logs,
432+
'passphrase': passphrase,
433+
'anonymous_url': anonymous_url,
434+
'file_unpack_form': file_unpack_form,
435+
}
436+
)
435437

436438

437439
@handling_editor
@@ -481,21 +483,21 @@ def edit_submission(request, project_slug, *args, **kwargs):
481483
resource_type=project.resource_type, instance=edit_log)
482484

483485
return render(request,
484-
'console/edit_submission.html',
485-
{**submission_info_card_params(
486-
request,
487-
project,
488-
reassign_editor_form,
489-
embargo_form,
490-
internal_note_form,
491-
bulk_download=True,
492-
force_calculate=False,
493-
file_unpack_form=None
494-
),
495-
'edit_submission_form': edit_submission_form,
496-
'editor_home': True,
497-
}
498-
)
486+
'console/edit_submission.html',
487+
{**submission_info_card_params(
488+
request,
489+
project,
490+
reassign_editor_form,
491+
embargo_form,
492+
internal_note_form,
493+
bulk_download=True,
494+
force_calculate=False,
495+
file_unpack_form=None
496+
),
497+
'edit_submission_form': edit_submission_form,
498+
'editor_home': True,
499+
}
500+
)
499501

500502

501503
@handling_editor
@@ -631,16 +633,16 @@ def copyedit_submission(request, project_slug, *args, **kwargs):
631633
response = render(
632634
request,
633635
'console/copyedit_submission.html',
634-
{**submission_info_card_params(
635-
request,
636-
project,
637-
reassign_editor_form,
638-
embargo_form,
639-
internal_note_form,
640-
bulk_download=False,
641-
force_calculate=True,
642-
file_unpack_form=None
643-
),
636+
{**submission_info_card_params(
637+
request,
638+
project,
639+
reassign_editor_form,
640+
embargo_form,
641+
internal_note_form,
642+
bulk_download=False,
643+
force_calculate=True,
644+
file_unpack_form=None
645+
),
644646
'description_form': description_form,
645647
'ethics_form': ethics_form,
646648
'individual_size_limit': readable_size(ActiveProject.INDIVIDUAL_FILE_SIZE_LIMIT),
@@ -667,7 +669,7 @@ def copyedit_submission(request, project_slug, *args, **kwargs):
667669
'add_item_url': edit_url,
668670
'remove_item_url': edit_url,
669671
'discovery_form': discovery_form,
670-
},
672+
}
671673
)
672674
if description_form_saved:
673675
set_saved_fields_cookie(description_form, request.path, response)
@@ -707,22 +709,24 @@ def awaiting_authors(request, project_slug, *args, **kwargs):
707709
yesterday = timezone.now() + timezone.timedelta(days=-1)
708710

709711
return render(request,
710-
'console/awaiting_authors.html',
711-
{**submission_info_card_params(
712-
request,
713-
project,
714-
reassign_editor_form,
715-
embargo_form,
716-
internal_note_form,
717-
bulk_download=True,
718-
force_calculate=False,
719-
file_unpack_form=None
720-
),
721-
'copyedit_logs': copyedit_logs,
722-
'outstanding_emails': outstanding_emails,
723-
'yesterday': yesterday,
724-
'editor_home': True,
725-
'reassign_editor_form': reassign_editor_form})
712+
'console/awaiting_authors.html',
713+
{**submission_info_card_params(
714+
request,
715+
project,
716+
reassign_editor_form,
717+
embargo_form,
718+
internal_note_form,
719+
bulk_download=True,
720+
force_calculate=False,
721+
file_unpack_form=None
722+
),
723+
'copyedit_logs': copyedit_logs,
724+
'outstanding_emails': outstanding_emails,
725+
'yesterday': yesterday,
726+
'editor_home': True,
727+
'reassign_editor_form': reassign_editor_form
728+
}
729+
)
726730

727731

728732
@handling_editor
@@ -825,24 +829,24 @@ def publish_submission(request, project_slug, *args, **kwargs):
825829
publish_form = forms.PublishForm(project=project)
826830

827831
return render(request,
828-
'console/publish_submission.html',
829-
{**submission_info_card_params(
830-
request,
831-
project,
832-
reassign_editor_form,
833-
embargo_form,
834-
internal_note_form,
835-
bulk_download=True,
836-
force_calculate=True,
837-
file_unpack_form=None
838-
),
839-
'publishable': publishable,
840-
'copyedit_logs': copyedit_logs,
841-
'publish_form': publish_form,
842-
'max_slug_length': MAX_PROJECT_SLUG_LENGTH,
843-
'editor_home': True,
844-
}
845-
)
832+
'console/publish_submission.html',
833+
{**submission_info_card_params(
834+
request,
835+
project,
836+
reassign_editor_form,
837+
embargo_form,
838+
internal_note_form,
839+
bulk_download=True,
840+
force_calculate=True,
841+
file_unpack_form=None
842+
),
843+
'publishable': publishable,
844+
'copyedit_logs': copyedit_logs,
845+
'publish_form': publish_form,
846+
'max_slug_length': MAX_PROJECT_SLUG_LENGTH,
847+
'editor_home': True,
848+
}
849+
)
846850

847851

848852
@console_permission_required('project.change_storagerequest')

0 commit comments

Comments
 (0)