From 50850d1abdb4cf11cdcd47410b451939b04a5ee2 Mon Sep 17 00:00:00 2001
From: SwoopDoable <swoop-doable.0v@icloud.com>
Date: Mon, 12 Aug 2024 17:16:46 +0200
Subject: [PATCH] Remove deprecated code
---
scipost_django/journals/urls/general.py | 15 ------
scipost_django/journals/views.py | 62 ++-----------------------
2 files changed, 4 insertions(+), 73 deletions(-)
diff --git a/scipost_django/journals/urls/general.py b/scipost_django/journals/urls/general.py
index 9cb803b8f..41fff3edb 100644
--- a/scipost_django/journals/urls/general.py
+++ b/scipost_django/journals/urls/general.py
@@ -113,21 +113,6 @@ urlpatterns = [
journals_views.author_affiliations,
name="author_affiliations",
),
- path(
- "admin/<publication_doi_label:doi_label>/authoraffiliations/<int:pk>/add/",
- journals_views.add_affiliation,
- name="author_affiliation_update",
- ),
- path(
- "admin/<publication_doi_label:doi_label>/authoraffiliations/<int:pk>/add/<int:organization_id>/",
- journals_views.add_affiliation_id,
- name="author_affiliation_add_id",
- ),
- path(
- "admin/<publication_doi_label:doi_label>/authoraffiliations/<int:pk>/remove/<int:organization_id>/",
- journals_views.remove_affiliation,
- name="author_affiliation_remove",
- ),
path(
"admin/<publication_doi_label:doi_label>/citation_list_metadata",
journals_views.CitationUpdateView.as_view(),
diff --git a/scipost_django/journals/views.py b/scipost_django/journals/views.py
index d1d734331..196d237d2 100644
--- a/scipost_django/journals/views.py
+++ b/scipost_django/journals/views.py
@@ -1107,64 +1107,10 @@ def get_affiliations() -> dict:
affiliations.append(aff)
return affiliations
- else: # There is only one affiliation OR something went wrong. We return all as is.
- return [
- section[:-1]
- ] # We remove the % at the end (which was put for the other case to work).
-
-
-@permission_required("scipost.can_draft_publication", return_403=True)
-@transaction.atomic
-def add_affiliation(request, doi_label, pk):
- """
- Adds an affiliation to a PublicationAuthorsTable.
- """
- table = get_object_or_404(PublicationAuthorsTable, pk=pk)
- form = AuthorsTableOrganizationSelectForm(request.POST or None)
- if form.is_valid():
- table.affiliations.add(form.cleaned_data["organization"])
- table.save()
- Publication.objects.filter(id=table.publication.id).update(
- cf_author_affiliation_indices_list=[]
- ) # force recompute it
- return redirect(
- reverse("journals:author_affiliations", kwargs={"doi_label": doi_label})
- )
- context = {"table": table, "add_affiliation_form": form}
- return render(request, "journals/author_affiliation_add.html", context)
-
-
-@permission_required("scipost.can_draft_publication", return_403=True)
-def add_affiliation_id(request, doi_label, pk, organization_id):
- """
- Adds an affiliation to a PublicationAuthorsTable directly via its ID.
- """
- table = get_object_or_404(PublicationAuthorsTable, pk=pk)
- org = get_object_or_404(Organization, pk=organization_id)
- table.affiliations.add(org)
- table.save()
- Publication.objects.filter(id=table.publication.id).update(
- cf_author_affiliation_indices_list=[]
- )
- return HttpResponse(f"Added{org.name} to {table.profile.full_name}'s affiliations.")
-
-
-@permission_required("scipost.can_draft_publication", return_403=True)
-@transaction.atomic
-def remove_affiliation(request, doi_label, pk, organization_id):
- """
- Remove an affiliation in a PublicationAuthorsTable.
- """
- table = get_object_or_404(PublicationAuthorsTable, pk=pk)
- org = get_object_or_404(Organization, pk=organization_id)
- table.affiliations.remove(org)
- table.save()
- Publication.objects.filter(id=table.publication.id).update(
- cf_author_affiliation_indices_list=[]
- ) # force recompute it
- return redirect(
- reverse("journals:author_affiliations", kwargs={"doi_label": doi_label})
- )
+ else:
+ # There is only one affiliation OR something went wrong. We return all as is.
+ # We remove the % at the end (which was put for the other case to work).
+ return [section[:-1]]
@permission_required("scipost.can_draft_publication", return_403=True)
--
GitLab