From 3e6ab85941cd8f161ba57f31a3ec8ce52db00c94 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Fri, 2 Feb 2024 11:05:27 +0100
Subject: [PATCH] enable unaccent for submissions and in pool
---
scipost_django/submissions/forms/__init__.py | 26 +++++++++----------
.../migrations/0144_enable_unaccent.py | 14 ++++++++++
2 files changed, 27 insertions(+), 13 deletions(-)
create mode 100644 scipost_django/submissions/migrations/0144_enable_unaccent.py
diff --git a/scipost_django/submissions/forms/__init__.py b/scipost_django/submissions/forms/__init__.py
index 539fca9e2..faeb2cbb3 100644
--- a/scipost_django/submissions/forms/__init__.py
+++ b/scipost_django/submissions/forms/__init__.py
@@ -456,11 +456,11 @@ class SubmissionPoolSearchForm(forms.Form):
)
if self.cleaned_data.get("author"):
submissions = submissions.filter(
- author_list__icontains=self.cleaned_data.get("author")
+ author_list__unaccent__icontains=self.cleaned_data.get("author")
)
if self.cleaned_data.get("title"):
submissions = submissions.filter(
- title__icontains=self.cleaned_data.get("title")
+ title__unaccent__icontains=self.cleaned_data.get("title")
)
if self.cleaned_data.get("identifier"):
submissions = submissions.filter(
@@ -2414,9 +2414,9 @@ class ReportForm(forms.ModelForm):
}
)
- self.fields[
- "file_attachment"
- ].label = "File attachment (2MB limit; for a figure or similar - please avoid annotated pdfs)"
+ self.fields["file_attachment"].label = (
+ "File attachment (2MB limit; for a figure or similar - please avoid annotated pdfs)"
+ )
# Required fields on submission; optional on save as draft
if "save_submit" in self.data:
@@ -3019,11 +3019,11 @@ class SubmissionCycleChoiceForm(forms.ModelForm):
self.fields["refereeing_cycle"].choices = SUBMISSION_CYCLE_CHOICES
other_submissions = self.instance.other_versions.all()
if other_submissions:
- self.fields[
- "referees_reinvite"
- ].queryset = RefereeInvitation.objects.filter(
- submission__in=other_submissions
- ).distinct()
+ self.fields["referees_reinvite"].queryset = (
+ RefereeInvitation.objects.filter(
+ submission__in=other_submissions
+ ).distinct()
+ )
def save(self):
"""
@@ -3059,9 +3059,9 @@ class iThenticateReportForm(forms.ModelForm):
self.add_error(
None, "Preprint document not found. Please upload the pdf manually."
)
- self.fields[
- "file"
- ] = forms.FileField() # Add this field now it's needed
+ self.fields["file"] = (
+ forms.FileField()
+ ) # Add this field now it's needed
elif not doc_id and cleaned_data.get("file"):
cleaned_data["document"] = cleaned_data["file"].read()
elif doc_id:
diff --git a/scipost_django/submissions/migrations/0144_enable_unaccent.py b/scipost_django/submissions/migrations/0144_enable_unaccent.py
new file mode 100644
index 000000000..e9f857dc6
--- /dev/null
+++ b/scipost_django/submissions/migrations/0144_enable_unaccent.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.18 on 2024-02-02 11:02
+
+from django.db import migrations
+from django.contrib.postgres.operations import UnaccentExtension
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("submissions", "0143_submission_auto_updated_fellowship"),
+ ]
+
+ operations = [
+ UnaccentExtension(),
+ ]
--
GitLab