diff --git a/physionet-django/console/test_views.py b/physionet-django/console/test_views.py index 6699061c03..5eae74cfdd 100644 --- a/physionet-django/console/test_views.py +++ b/physionet-django/console/test_views.py @@ -210,8 +210,8 @@ def test_copyedit(self): # Recomplete copyedit response = self.client.post(reverse( 'copyedit_submission', args=(project.slug,)), - data={'complete_copyedit': '', 'made_changes':1, - 'changelog_summary': 'Removed your things'}) + data={'complete_copyedit': '', 'made_changes': 1, + 'changelog_summary': 'Removed your things'}) project = ActiveProject.objects.get(id=project.id) self.assertFalse(project.copyeditable()) @@ -317,8 +317,7 @@ def test_publish(self): project = PublishedProject.objects.get(slug=custom_slug, version=project.version) # Access the published project's page and its (open) files - response = self.client.get(reverse('published_project', - args=(project.slug, project.version))) + response = self.client.get(reverse('published_project', args=(project.slug, project.version))) self.assertEqual(response.status_code, 200) response = self.client.get(reverse('serve_published_project_file', args=( project.slug, project.version, 'subject-100/100.atr'))) @@ -328,8 +327,7 @@ def test_publish(self): self.assertEqual(response.status_code, 200) # Access the submission log as the author self.client.login(username='rgmark', password='Tester11!') - response = self.client.get(reverse('published_submission_history', - args=(project.slug, project.version,))) + response = self.client.get(reverse('published_submission_history', args=(project.slug, project.version,))) self.assertEqual(response.status_code, 200) # The internal links should now point to published files diff --git a/physionet-django/project/migrations/0064_datauploadagreement.py b/physionet-django/project/migrations/0064_datauploadagreement.py index 3b8eedd1d5..d4698b8cfb 100644 --- a/physionet-django/project/migrations/0064_datauploadagreement.py +++ b/physionet-django/project/migrations/0064_datauploadagreement.py @@ -18,7 +18,8 @@ class Migration(migrations.Migration): ('has_copy_right_permission', models.PositiveSmallIntegerField(choices=[(0, 'Yes'), (1, 'No')])), ('has_human_subject_data', models.PositiveSmallIntegerField(choices=[(0, 'Yes'), (1, 'No')])), ('has_phi', models.PositiveSmallIntegerField(choices=[(0, 'Yes'), (1, 'No'), (2, 'NA')])), - ('project', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='project.activeproject')), + ('project', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, + to='project.activeproject')), ], ), ] diff --git a/physionet-django/project/modelcomponents/activeproject.py b/physionet-django/project/modelcomponents/activeproject.py index 52198d2763..fd18615228 100644 --- a/physionet-django/project/modelcomponents/activeproject.py +++ b/physionet-django/project/modelcomponents/activeproject.py @@ -322,7 +322,7 @@ def check_integrity(self): # Data Upload Agreement try: DataUploadAgreement.objects.get(project_id=self.id) - except: + except DataUploadAgreement.IntegrityError: self.integrity_errors.append('Missing required field: Data Upload Agreement') # Metadata diff --git a/physionet-django/project/views.py b/physionet-django/project/views.py index 4c74bee8de..d1fa1b3496 100644 --- a/physionet-django/project/views.py +++ b/physionet-django/project/views.py @@ -1041,7 +1041,7 @@ def project_files(request, project_slug, subdir='', **kwargs): maintenance_message = settings.SYSTEM_MAINTENANCE_MESSAGE or ( "The site is currently undergoing maintenance, and project " "files cannot be edited. Please try again later." - ) +) files_editable = False else: maintenance_message = None