diff --git a/scipost_django/scipost/views.py b/scipost_django/scipost/views.py index 0023801d2cfd2b6edad99e4d41d07ca6fa8664d3..8fdd1a1d955c385b478f85be00fc7bcfa7015e1b 100644 --- a/scipost_django/scipost/views.py +++ b/scipost_django/scipost/views.py @@ -88,7 +88,7 @@ from submissions.models import ( EditorialAssignment, EICRecommendation, ) -from submissions.forms import SubmissionSearchForm, ReportSearchForm +from submissions.forms import PortalSubmissionSearchForm, ReportSearchForm from theses.models import ThesisLink from theses.forms import ThesisSearchForm @@ -288,7 +288,7 @@ def portal_hx_publications_page(request): def portal_hx_submissions(request): reports_needed = request.GET.get("reports_needed", False) - form = SubmissionSearchForm( + form = PortalSubmissionSearchForm( acad_field_slug=request.session.get("session_acad_field_slug", None), specialty_slug=request.session.get("session_specialty_slug", None), reports_needed=reports_needed, @@ -301,7 +301,7 @@ def portal_hx_submissions_page(request): session_acad_field_slug = request.session.get("session_acad_field_slug", None) session_specialty_slug = request.session.get("session_specialty_slug", None) reports_needed = request.GET.get("reports_needed", False) - form = SubmissionSearchForm( + form = PortalSubmissionSearchForm( request.POST or None, acad_field_slug=session_acad_field_slug, specialty_slug=session_specialty_slug, diff --git a/scipost_django/submissions/forms/__init__.py b/scipost_django/submissions/forms/__init__.py index 251c4331f81fdfe893c205ce6eacd1e5290b7dc4..9946786d9c8aeafd21da01e201d78c0d75ae3bb3 100644 --- a/scipost_django/submissions/forms/__init__.py +++ b/scipost_django/submissions/forms/__init__.py @@ -18,7 +18,7 @@ from crispy_bootstrap5.bootstrap5 import FloatingField from dal import autocomplete -from .constants import ( +from ..constants import ( ASSIGNMENT_BOOL, ASSIGNMENT_REFUSAL_REASONS, REPORT_ACTION_CHOICES, @@ -51,9 +51,9 @@ from .constants import ( STATUS_ACCEPTED, STATUS_DECLINED, ) -from . import exceptions, helpers -from .helpers import to_ascii_only -from .models import ( +from .. import exceptions, helpers +from ..helpers import to_ascii_only +from ..models import ( PreprintServer, Submission, RefereeInvitation, @@ -65,7 +65,7 @@ from .models import ( iThenticateReport, EditorialCommunication, ) -from .regexes import CHEMRXIV_DOI_PATTERN +from ..regexes import CHEMRXIV_DOI_PATTERN from colleges.models import Fellowship from common.utils import Q_with_alternative_spellings @@ -87,7 +87,7 @@ FIGSHARE_IDENTIFIER_PATTERN = r"^[0-9]+\.v[0-9]{1,2}$" OSFPREPRINTS_IDENTIFIER_PATTERN = r"^[a-z0-9]+$" -class SubmissionSearchForm(forms.Form): +class PortalSubmissionSearchForm(forms.Form): author = forms.CharField(max_length=100, required=False, label="Author(s)") title = forms.CharField(max_length=100, required=False) submitted_to = forms.ModelChoiceField(