diff --git a/funders/migrations/0012_auto_20180922_1609.py b/funders/migrations/0012_auto_20180922_1609.py
new file mode 100644
index 0000000000000000000000000000000000000000..de5b37811e926a877e747a46656db449e0535817
--- /dev/null
+++ b/funders/migrations/0012_auto_20180922_1609.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 14:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('funders', '0011_remove_funder_organization'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='funder',
+ old_name='org',
+ new_name='organization',
+ ),
+ ]
diff --git a/funders/models.py b/funders/models.py
index 0fa4d8ef5c036c38c7d2eb5989d0257f24baf075..e88ea8427b35c59d568cb9cbcabc7878bcbb6039 100644
--- a/funders/models.py
+++ b/funders/models.py
@@ -23,7 +23,7 @@ class Funder(models.Model):
name = models.CharField(max_length=256)
acronym = models.CharField(max_length=32, blank=True)
identifier = models.CharField(max_length=200, unique=True)
- org = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE,
+ organization = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE,
blank=True, null=True)
objects = FunderQuerySet.as_manager()
diff --git a/journals/forms.py b/journals/forms.py
index 6facc6eebd462b57bcb553bca75cab7a0107e170..6506e156deac5debd120a3c84632f8304a4af4e2 100644
--- a/journals/forms.py
+++ b/journals/forms.py
@@ -125,7 +125,7 @@ PublicationAuthorOrderingFormSet = modelformset_factory(
class AuthorsTableOrganizationSelectForm(forms.ModelForm):
- org = AutoCompleteSelectField('organization_lookup')
+ organization = AutoCompleteSelectField('organization_lookup')
class Meta:
model = PublicationAuthorsTable
@@ -697,12 +697,12 @@ class PublicationPublishForm(RequestFormMixin, forms.ModelForm):
class SetOrgPubFractionForm(forms.ModelForm):
class Meta:
model = OrgPubFraction
- fields = ['org', 'publication', 'fraction']
+ fields = ['organization', 'publication', 'fraction']
def __init__(self, *args, **kwargs):
super(SetOrgPubFractionForm, self).__init__(*args, **kwargs)
if self.instance.id:
- self.fields['org'].disabled = True
+ self.fields['organization'].disabled = True
self.fields['publication'].widget = forms.HiddenInput()
@@ -721,6 +721,6 @@ class BaseOrgPubFractionsFormSet(BaseModelFormSet):
OrgPubFractionsFormSet = modelformset_factory(OrgPubFraction,
- fields=('publication', 'org', 'fraction'),
+ fields=('publication', 'organization', 'fraction'),
formset=BaseOrgPubFractionsFormSet,
form=SetOrgPubFractionForm, extra=0)
diff --git a/journals/migrations/0041_auto_20180922_1609.py b/journals/migrations/0041_auto_20180922_1609.py
new file mode 100644
index 0000000000000000000000000000000000000000..148c117efad368677bd0eac8a5681357416f3e00
--- /dev/null
+++ b/journals/migrations/0041_auto_20180922_1609.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 14:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0002_populate_from_partners_org'),
+ ('journals', '0040_auto_20180922_1544'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='orgpubfraction',
+ old_name='org',
+ new_name='organization',
+ ),
+ migrations.RenameField(
+ model_name='publicationauthorstable',
+ old_name='affs',
+ new_name='affiliations',
+ ),
+ migrations.AlterUniqueTogether(
+ name='orgpubfraction',
+ unique_together=set([('organization', 'publication')]),
+ ),
+ ]
diff --git a/journals/models.py b/journals/models.py
index ea538baea9ed74ece257442a6b995926199c7073..6858d5d598aefe03a53924e268b81df915afad02 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -41,7 +41,7 @@ class PublicationAuthorsTable(models.Model):
unregistered_author = models.ForeignKey('journals.UnregisteredAuthor', null=True, blank=True,
related_name='+')
contributor = models.ForeignKey('scipost.Contributor', null=True, blank=True, related_name='+')
- affs = models.ManyToManyField('organizations.Organization', blank=True)
+ affiliations = models.ManyToManyField('organizations.Organization', blank=True)
order = models.PositiveSmallIntegerField()
class Meta:
@@ -619,14 +619,14 @@ class OrgPubFraction(models.Model):
To be set (ideally) during production phase, based on information provided by the authors.
"""
- org = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE,
+ organization = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE,
related_name='pubfractions', blank=True, null=True)
publication = models.ForeignKey('journals.Publication', on_delete=models.CASCADE,
related_name='pubfractions')
fraction = models.DecimalField(max_digits=4, decimal_places=3)
class Meta:
- unique_together = (('org', 'publication'),)
+ unique_together = (('organization', 'publication'),)
class Deposit(models.Model):
diff --git a/partners/forms.py b/partners/forms.py
index 02345d6c34cc6b8cd23afb9adbe9601e6e0d9a6d..f4a94bd976839fbdae65a90efbb6f78401c7e3c2 100644
--- a/partners/forms.py
+++ b/partners/forms.py
@@ -149,7 +149,7 @@ class PartnerForm(forms.ModelForm):
model = Partner
fields = (
'institution',
- 'org',
+ 'organization',
'status',
'main_contact'
)
diff --git a/partners/migrations/0018_auto_20180922_1609.py b/partners/migrations/0018_auto_20180922_1609.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ca67b78ca2c7178fe3fa0525fb669957d6a2615
--- /dev/null
+++ b/partners/migrations/0018_auto_20180922_1609.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 14:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0017_auto_20180922_1603'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='partner',
+ old_name='org',
+ new_name='organization',
+ ),
+ ]
diff --git a/partners/models.py b/partners/models.py
index b272aa17102ffeedaffc8045381ea796aa0e6246..7106748a976e5739aa8d1bf429b635714c8c2131 100644
--- a/partners/models.py
+++ b/partners/models.py
@@ -230,7 +230,7 @@ class Partner(models.Model):
"""
institution = models.ForeignKey('partners.Institution', on_delete=models.CASCADE,
blank=True, null=True)
- org = models.OneToOneField('organizations.Organization', on_delete=models.CASCADE,
+ organization = models.OneToOneField('organizations.Organization', on_delete=models.CASCADE,
blank=True, null=True)
status = models.CharField(max_length=16, choices=PARTNER_STATUS, default=PARTNER_INITIATED)
main_contact = models.ForeignKey('partners.Contact', on_delete=models.SET_NULL,