From c66e6d9d5b89e3befb6d1d646452d754b67805a3 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 4 Apr 2019 19:49:42 +0200
Subject: [PATCH] Remove UnregisteredAuthor model
---
.../production/online_publication.html | 4 +--
journals/admin.py | 10 +------
journals/forms.py | 11 ++-----
.../migrations/0058_auto_20190404_1949.py | 30 +++++++++++++++++++
journals/models.py | 18 -----------
.../publication_administration.py | 3 +-
journals/views.py | 2 +-
organizations/models.py | 2 +-
profiles/forms.py | 7 +----
profiles/templates/profiles/profile_list.html | 5 ----
profiles/views.py | 21 ++-----------
11 files changed, 42 insertions(+), 71 deletions(-)
create mode 100644 journals/migrations/0058_auto_20190404_1949.py
diff --git a/guides/templates/guides/editorial/production/online_publication.html b/guides/templates/guides/editorial/production/online_publication.html
index 6838a55b3..161e3d034 100644
--- a/guides/templates/guides/editorial/production/online_publication.html
+++ b/guides/templates/guides/editorial/production/online_publication.html
@@ -72,8 +72,8 @@
<h3 id="author-listing">Author listing</h3>
<blockquote>
<p>If not all authors appear in the list presented at the top of the EdAdmin tools, these should be added by following the <code>Add a missing author</code> link.</p>
-<p>The search form can be used to find missing authors who might be Registered Contributors. If found, a one-click process adds them.</p>
-<p>You can otherwise create an <code>UnregisteredAuthor</code> object instance and link it to the publication, by simply filling in the first and last name fields and clicking on <code>Add</code>.</p>
+<p>The search form can be used to find missing authors. If found in our <code>Profiles</code> database, a one-click process adds them.</p>
+<p>You can otherwise create a new <code>Profile</code> object instance and link it to the publication, by simply filling in the first and last name fields and clicking on <code>Add</code>.</p>
</blockquote>
<h3 id="preparation-of-the-jats-version-of-the-abstract">Preparation of the JATS version of the abstract</h3>
<blockquote>
diff --git a/journals/admin.py b/journals/admin.py
index 70325aa53..707605c5b 100644
--- a/journals/admin.py
+++ b/journals/admin.py
@@ -5,7 +5,7 @@ __license__ = "AGPL v3"
from django.contrib import admin, messages
from django import forms
-from journals.models import UnregisteredAuthor, Journal, Volume, Issue, Publication, \
+from journals.models import Journal, Volume, Issue, Publication, \
Deposit, DOAJDeposit, GenericDOIDeposit, Reference, PublicationAuthorsTable,\
OrgPubFraction
@@ -13,14 +13,6 @@ from scipost.models import Contributor
from submissions.models import Submission
-class UnregisteredAuthorAdmin(admin.ModelAdmin):
- search_fields = ['last_name']
- ordering = ['last_name']
-
-
-admin.site.register(UnregisteredAuthor, UnregisteredAuthorAdmin)
-
-
class JournalAdmin(admin.ModelAdmin):
search_fields = ['name']
list_display = ['__str__', 'doi_string', 'active']
diff --git a/journals/forms.py b/journals/forms.py
index a21bc9ae4..457c318f2 100644
--- a/journals/forms.py
+++ b/journals/forms.py
@@ -12,7 +12,7 @@ from datetime import datetime
from django import forms
from django.conf import settings
-from django.forms import BaseFormSet, formset_factory, BaseModelFormSet, modelformset_factory
+from django.forms import BaseModelFormSet, modelformset_factory
from django.template import loader
from django.utils import timezone
@@ -20,8 +20,7 @@ from ajax_select.fields import AutoCompleteSelectField
from .constants import STATUS_DRAFT, PUBLICATION_PREPUBLISHED, PUBLICATION_PUBLISHED
from .exceptions import PaperNumberingError
-from .models import Issue, Publication, Reference,\
- UnregisteredAuthor, PublicationAuthorsTable, OrgPubFraction
+from .models import Issue, Publication, Reference, PublicationAuthorsTable, OrgPubFraction
from .utils import JournalUtils
from .signals import notify_manuscript_published
@@ -39,12 +38,6 @@ from submissions.constants import STATUS_PUBLISHED
from submissions.models import Submission
-class UnregisteredAuthorForm(forms.ModelForm):
- class Meta:
- model = UnregisteredAuthor
- fields = ('first_name', 'last_name')
-
-
class CitationListBibitemsForm(forms.ModelForm):
latex_bibitems = forms.CharField(widget=forms.Textarea())
diff --git a/journals/migrations/0058_auto_20190404_1949.py b/journals/migrations/0058_auto_20190404_1949.py
new file mode 100644
index 000000000..1a0a43750
--- /dev/null
+++ b/journals/migrations/0058_auto_20190404_1949.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-04-04 17:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0057_remove_publication_institutions'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='unregisteredauthor',
+ name='profile',
+ ),
+ migrations.RemoveField(
+ model_name='publication',
+ name='authors_unregistered',
+ ),
+ migrations.RemoveField(
+ model_name='publicationauthorstable',
+ name='unregistered_author',
+ ),
+ migrations.DeleteModel(
+ name='UnregisteredAuthor',
+ ),
+ ]
diff --git a/journals/models.py b/journals/models.py
index 1d0e988f7..e2b2eab55 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -33,17 +33,6 @@ from scipost.fields import ChoiceArrayField
# Journals etc #
################
-class UnregisteredAuthor(models.Model):
- """UnregisteredAuthor is a replacement for a Contributor if an author has not registered."""
-
- first_name = models.CharField(max_length=100)
- last_name = models.CharField(max_length=100)
- profile = models.ForeignKey(
- 'profiles.Profile', on_delete=models.SET_NULL, null=True, blank=True)
-
- def __str__(self):
- return self.last_name + ', ' + self.first_name
-
class PublicationAuthorsTable(models.Model):
"""
@@ -59,8 +48,6 @@ class PublicationAuthorsTable(models.Model):
publication = models.ForeignKey('journals.Publication', related_name='authors')
profile = models.ForeignKey('profiles.Profile', on_delete=models.PROTECT,
blank=True, null=True)
- unregistered_author = models.ForeignKey('journals.UnregisteredAuthor', null=True, blank=True,
- related_name='+')
contributor = models.ForeignKey('scipost.Contributor', null=True, blank=True, related_name='+')
affiliations = models.ManyToManyField('organizations.Organization', blank=True)
order = models.PositiveSmallIntegerField()
@@ -410,11 +397,6 @@ class Publication(models.Model):
authors_registered = models.ManyToManyField('scipost.Contributor', blank=True,
through='PublicationAuthorsTable',
through_fields=('publication', 'contributor'))
- authors_unregistered = models.ManyToManyField('journals.UnregisteredAuthor', blank=True,
- through='PublicationAuthorsTable',
- through_fields=(
- 'publication',
- 'unregistered_author'))
authors_claims = models.ManyToManyField('scipost.Contributor', blank=True,
related_name='claimed_publications')
authors_false_claims = models.ManyToManyField('scipost.Contributor', blank=True,
diff --git a/journals/templatetags/publication_administration.py b/journals/templatetags/publication_administration.py
index 7e5a47489..13e0c9f5a 100644
--- a/journals/templatetags/publication_administration.py
+++ b/journals/templatetags/publication_administration.py
@@ -32,8 +32,7 @@ def authors_in_right_order(publication):
@register.filter
def author_affiliations_complete(publication):
"""
- Checks if each author (registered or unregistered) has an
- associated AuthorAffiliation instance.
+ Checks if each author has a non-empty affiliations field.
"""
if not has_all_author_relations(publication):
return False
diff --git a/journals/views.py b/journals/views.py
index 1e6011ebd..787e2e919 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -33,7 +33,7 @@ from .exceptions import InvalidDOIError
from .models import Journal, Issue, Publication, Deposit, DOAJDeposit,\
GenericDOIDeposit, PublicationAuthorsTable, OrgPubFraction
from .forms import AbstractJATSForm, FundingInfoForm,\
- UnregisteredAuthorForm, AuthorsTableOrganizationSelectForm,\
+ AuthorsTableOrganizationSelectForm,\
CreateMetadataXMLForm, CitationListBibitemsForm,\
ReferenceFormSet, CreateMetadataDOAJForm, DraftPublicationForm,\
PublicationGrantsForm, DraftPublicationApprovalForm, PublicationPublishForm,\
diff --git a/organizations/models.py b/organizations/models.py
index 4abb30973..242df9914 100644
--- a/organizations/models.py
+++ b/organizations/models.py
@@ -23,7 +23,7 @@ from .managers import OrganizationQuerySet
from scipost.constants import TITLE_CHOICES
from scipost.fields import ChoiceArrayField
from scipost.models import Contributor
-from journals.models import Publication, OrgPubFraction, UnregisteredAuthor
+from journals.models import Publication, OrgPubFraction
from profiles.models import Profile
diff --git a/profiles/forms.py b/profiles/forms.py
index d14921d28..d041802ab 100644
--- a/profiles/forms.py
+++ b/profiles/forms.py
@@ -9,7 +9,6 @@ from ajax_select.fields import AutoCompleteSelectField
from common.forms import ModelChoiceFieldwithid
from invitations.models import RegistrationInvitation
-from journals.models import UnregisteredAuthor
from ontology.models import Topic
from scipost.models import Contributor
from submissions.models import RefereeInvitation
@@ -49,7 +48,7 @@ class ProfileForm(forms.ModelForm):
Check that only recognized types are used.
"""
cleaned_instance_from_type = self.cleaned_data['instance_from_type']
- if cleaned_instance_from_type not in ['', 'contributor', 'unregisteredauthor',
+ if cleaned_instance_from_type not in ['', 'contributor',
'refereeinvitation', 'registrationinvitation']:
raise forms.ValidationError('The from_type hidden field is inconsistent.')
return cleaned_instance_from_type
@@ -65,8 +64,6 @@ class ProfileForm(forms.ModelForm):
if instance_pk:
if self.cleaned_data['instance_from_type'] == 'contributor':
Contributor.objects.filter(pk=instance_pk).update(profile=profile)
- elif self.cleaned_data['instance_from_type'] == 'unregisteredauthor':
- UnregisteredAuthor.objects.filter(pk=instance_pk).update(profile=profile)
elif self.cleaned_data['instance_from_type'] == 'refereeinvitation':
RefereeInvitation.objects.filter(pk=instance_pk).update(profile=profile)
elif self.cleaned_data['instance_from_type'] == 'registrationinvitation':
@@ -131,8 +128,6 @@ class ProfileMergeForm(forms.Form):
profile.topics.add(*profile_old.topics.all())
- UnregisteredAuthor.objects.filter(profile=profile_old).update(profile=profile)
-
# Merge email
profile_old.emails.exclude(
email__in=profile.emails.values_list('email', flat=True)).update(
diff --git a/profiles/templates/profiles/profile_list.html b/profiles/templates/profiles/profile_list.html
index a28bbeed5..989b7461b 100644
--- a/profiles/templates/profiles/profile_list.html
+++ b/profiles/templates/profiles/profile_list.html
@@ -58,11 +58,6 @@ $(document).ready(function($) {
{% else %}
<li><i class="fa fa-check-circle text-success"></i> All Registration Invitations have a Profile</li>
{% endif %}
- {% if next_unreg_auth_wo_profile %}
- <li><i class="fa fa-exclamation-circle text-warning"></i> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='unregisteredauthor' pk=next_unreg_auth_wo_profile.id %}">the next</a> UnregisteredAuthor without one ({{ nr_unreg_auth_wo_profile }} to handle)</li>
- {% else %}
- <li><i class="fa fa-check-circle text-success"></i> All UnregisteredAuthors have a Profile</li>
- {% endif %}
{% if next_refinv_wo_profile %}
<li><i class="fa fa-exclamation-circle text-warning"></i> Create a Profile for <a href="{% url 'profiles:profile_create' from_type='refereeinvitation' pk=next_refinv_wo_profile.id %}">the next</a> Referee Invitation without one ({{ nr_refinv_wo_profile }} to handle)</li>
{% else %}
diff --git a/profiles/views.py b/profiles/views.py
index 096725e39..9bdf229bb 100644
--- a/profiles/views.py
+++ b/profiles/views.py
@@ -22,7 +22,6 @@ from scipost.models import Contributor
from scipost.forms import SearchTextForm
from invitations.models import RegistrationInvitation
-from journals.models import UnregisteredAuthor
from submissions.models import RefereeInvitation
from .models import Profile, ProfileEmail, Affiliation
@@ -42,7 +41,7 @@ class ProfileCreateView(PermissionsMixin, CreateView):
def get_context_data(self, *args, **kwargs):
"""
When creating a Profile, if initial data obtained from another model
- (Contributor, UnregisteredAuthor, RefereeInvitation or RegistrationInvitation)
+ (Contributor, RefereeInvitation or RegistrationInvitation)
is provided, this fills the context with possible already-existing Profiles.
"""
context = super().get_context_data(*args, **kwargs)
@@ -57,9 +56,6 @@ class ProfileCreateView(PermissionsMixin, CreateView):
matching_profiles = matching_profiles.filter(
Q(last_name=contributor.user.last_name) |
Q(emails__email__in=contributor.user.email))
- elif from_type == 'unregisteredauthor':
- unreg_auth = get_object_or_404(UnregisteredAuthor, pk=pk)
- matching_profiles = matching_profiles.filter(last_name=unreg_auth.last_name)
elif from_type == 'refereeinvitation':
print ('Here refinv')
refinv = get_object_or_404(RefereeInvitation, pk=pk)
@@ -78,7 +74,7 @@ class ProfileCreateView(PermissionsMixin, CreateView):
def get_initial(self):
"""
Provide initial data based on kwargs.
- The data can come from a Contributor, Invitation, UnregisteredAuthor, ...
+ The data can come from a Contributor, Invitation, ...
"""
initial = super().get_initial()
from_type = self.kwargs.get('from_type', None)
@@ -99,12 +95,6 @@ class ProfileCreateView(PermissionsMixin, CreateView):
'webpage': contributor.personalwebpage,
'accepts_SciPost_emails': contributor.accepts_SciPost_emails,
})
- elif from_type == 'unregisteredauthor':
- unreg_auth = get_object_or_404(UnregisteredAuthor, pk=pk)
- initial.update({
- 'first_name': unreg_auth.first_name,
- 'last_name': unreg_auth.last_name,
- })
elif from_type == 'refereeinvitation':
refinv = get_object_or_404(RefereeInvitation, pk=pk)
initial.update({
@@ -133,7 +123,7 @@ class ProfileCreateView(PermissionsMixin, CreateView):
def profile_match(request, profile_id, from_type, pk):
"""
Links an existing Profile to one of existing
- Contributor, UnregisteredAuthor, RefereeInvitation or RegistrationInvitation.
+ Contributor, RefereeInvitation or RegistrationInvitation.
Profile relates to Contributor as OneToOne.
Matching is thus only allowed if there are no duplicate objects for these elements.
@@ -166,8 +156,6 @@ def profile_match(request, profile_id, from_type, pk):
email, __ = ProfileEmail.objects.get_or_create(
profile=profile, email=contributor.user.email)
profile.emails.filter(id=email.id).update(primary=True, still_valid=True)
- elif from_type == 'unregisteredauthor':
- nr_rows = UnregisteredAuthor.objects.filter(pk=pk).update(profile=profile)
elif from_type == 'refereeinvitation':
nr_rows = RefereeInvitation.objects.filter(pk=pk).update(profile=profile)
elif from_type == 'registrationinvitation':
@@ -243,7 +231,6 @@ class ProfileListView(PermissionsMixin, PaginationMixin, ListView):
contributors_w_duplicate_names = Contributor.objects.with_duplicate_names()
contributors_wo_profile = Contributor.objects.nonduplicates().filter(profile__isnull=True)
nr_potential_duplicate_profiles = Profile.objects.potential_duplicates().count()
- unreg_auth_wo_profile = UnregisteredAuthor.objects.filter(profile__isnull=True)
refinv_wo_profile = RefereeInvitation.objects.filter(profile__isnull=True)
reginv_wo_profile = RegistrationInvitation.objects.filter(profile__isnull=True)
@@ -255,8 +242,6 @@ class ProfileListView(PermissionsMixin, PaginationMixin, ListView):
'nr_contributors_wo_profile': contributors_wo_profile.count(),
'nr_potential_duplicate_profiles': nr_potential_duplicate_profiles,
'next_contributor_wo_profile': contributors_wo_profile.first(),
- 'nr_unreg_auth_wo_profile': unreg_auth_wo_profile.count(),
- 'next_unreg_auth_wo_profile': unreg_auth_wo_profile.first(),
'nr_refinv_wo_profile': refinv_wo_profile.count(),
'next_refinv_wo_profile': refinv_wo_profile.first(),
'nr_reginv_wo_profile': reginv_wo_profile.count(),
--
GitLab