diff --git a/affiliations/admin.py b/affiliations/admin.py
index c5caa196a71f9055181c39f64ce325781942d563..ea51f0ed9181b2ba50fdc92b4fcdb010ee4b556d 100644
--- a/affiliations/admin.py
+++ b/affiliations/admin.py
@@ -1,7 +1,7 @@
from django.contrib import admin
-from .models import Affiliation, Institute
+from .models import Affiliation, Institution
admin.site.register(Affiliation)
-admin.site.register(Institute)
+admin.site.register(Institution)
diff --git a/affiliations/apps.py b/affiliations/apps.py
index f0e52fdbca89da2fb6af3a3f746f97a019459e75..d7b32efc830089fa50650a30bfbd7cf14964f7c2 100644
--- a/affiliations/apps.py
+++ b/affiliations/apps.py
@@ -10,4 +10,4 @@ class AffiliationsConfig(AppConfig):
from . import models, signals
post_save.connect(signals.notify_new_affiliation,
- sender=models.Institute)
+ sender=models.Institution)
diff --git a/affiliations/forms.py b/affiliations/forms.py
index c475964a874231ba9841e819d6255f47e60f68cc..648c13826cb6b34bb39217f14d5fd4713d665207 100644
--- a/affiliations/forms.py
+++ b/affiliations/forms.py
@@ -8,7 +8,7 @@ from django_countries.widgets import CountrySelectWidget
from common.widgets import DateWidget
-from .models import Affiliation, Institute
+from .models import Affiliation, Institution
class AffiliationForm(forms.ModelForm):
@@ -58,7 +58,7 @@ class AffiliationForm(forms.ModelForm):
institute.country = self.cleaned_data['country']
institute.save()
else:
- institute, __ = Institute.objects.get_or_create(
+ institute, __ = Institution.objects.get_or_create(
name=self.cleaned_data['name'],
country=self.cleaned_data['country'])
affiliation.institute = institute
@@ -97,15 +97,15 @@ AffiliationsFormset = modelformset_factory(Affiliation, form=AffiliationForm, ca
class InstituteMergeForm(forms.ModelForm):
- institute = forms.ModelChoiceField(queryset=Institute.objects.none())
+ institute = forms.ModelChoiceField(queryset=Institution.objects.none())
class Meta:
- model = Institute
+ model = Institution
fields = []
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.fields['institute'].queryset = Institute.objects.exclude(id=self.instance.id)
+ self.fields['institute'].queryset = Institution.objects.exclude(id=self.instance.id)
def save(self, commit=True):
old_institute = self.cleaned_data['institute']
diff --git a/affiliations/migrations/0008_auto_20171107_1337.py b/affiliations/migrations/0008_auto_20171107_1337.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f10974f9526d185353d0025153a983b9c3db1e6
--- /dev/null
+++ b/affiliations/migrations/0008_auto_20171107_1337.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-11-07 12:37
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('affiliations', '0007_auto_20171102_1256'),
+ ]
+
+ operations = [
+ migrations.RenameModel(
+ old_name='Institute',
+ new_name='Institution',
+ ),
+ ]
diff --git a/affiliations/models.py b/affiliations/models.py
index fddbf443c2a86de9f5703abc3d4d026aab3edc98..be224dc0db765f080f57e763ea333d404945d81c 100644
--- a/affiliations/models.py
+++ b/affiliations/models.py
@@ -7,7 +7,7 @@ from .constants import INSTITUTE_TYPES, TYPE_UNIVERSITY
from .managers import AffiliationQuerySet
-class Institute(models.Model):
+class Institution(models.Model):
"""
Any (scientific) Institute in the world should ideally have a SciPost registration.
"""
@@ -32,7 +32,7 @@ class Affiliation(models.Model):
An Affiliation is a (time dependent) connection between an Institute and a Contributor.
This could thus be changed over time and history will be preserved.
"""
- institute = models.ForeignKey('affiliations.Institute')
+ institute = models.ForeignKey('affiliations.Institution')
contributor = models.ForeignKey('scipost.Contributor')
begin_date = models.DateField(null=True, blank=True)
end_date = models.DateField(null=True, blank=True)
diff --git a/affiliations/views.py b/affiliations/views.py
index dd028053c37ba0fb1c8e77d1b463ad6a16155854..8963d139eca723bd44b13c962df37bc06529eb5c 100644
--- a/affiliations/views.py
+++ b/affiliations/views.py
@@ -8,18 +8,18 @@ from django.views.generic.list import ListView
from django.shortcuts import get_object_or_404
from .forms import InstituteMergeForm
-from .models import Institute
+from .models import Institution
@method_decorator(permission_required('scipost.can_manage_affiliations'), name='dispatch')
class InstituteListView(ListView):
- model = Institute
+ model = Institution
paginate_by = 100
@method_decorator(permission_required('scipost.can_manage_affiliations'), name='dispatch')
class InstituteUpdateView(UpdateView):
- model = Institute
+ model = Institution
pk_url_kwarg = 'institute_id'
fields = [
'name',
@@ -42,7 +42,7 @@ def merge_institutes(request, institute_id):
"""
Merge Affiliation (affiliation_id) into the Affliation chosen in the form.
"""
- institute = get_object_or_404(Institute, id=institute_id)
+ institute = get_object_or_404(Institution, id=institute_id)
form = InstituteMergeForm(request.POST or None, instance=institute)
if form.is_valid():
form.save()
diff --git a/journals/models.py b/journals/models.py
index a7ac541c86f2cf72f6150e39ac764d264132dcf0..7cde56d979c9490c90d060690ceb8b550d484658 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -166,7 +166,7 @@ class Publication(models.Model):
grants = models.ManyToManyField('funders.Grant', blank=True, related_name="publications")
funders_generic = models.ManyToManyField(
'funders.Funder', blank=True, related_name="publications") # not linked to a grant
- institutes = models.ManyToManyField('affiliations.Institute',
+ institutes = models.ManyToManyField('affiliations.Institution',
blank=True, related_name="publications")
# Metadata
diff --git a/scipost/forms.py b/scipost/forms.py
index 6a175bb129bf87ef00e2c342fcb4f324793724bc..cf13b65536d5bbf6ff118af26add4bbe1984ba10 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -24,7 +24,7 @@ from .decorators import has_contributor
from .models import Contributor, DraftInvitation, RegistrationInvitation,\
UnavailabilityPeriod, PrecookedEmail
-from affiliations.models import Affiliation, Institute
+from affiliations.models import Affiliation, Institution
from common.forms import MonthYearWidget
from partners.decorators import has_contact
@@ -116,7 +116,7 @@ class RegistrationForm(forms.Form):
'password': self.cleaned_data['password'],
'is_active': False
})
- institute, __ = Institute.objects.get_or_create(
+ institute, __ = Institution.objects.get_or_create(
country=self.cleaned_data['country_of_employment'],
name=self.cleaned_data['affiliation'],
)