From 73a4c96cf0f7e057f7ef601eb826e7c7f409ff32 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sat, 22 Sep 2018 16:26:58 +0200
Subject: [PATCH] Move complete, hopefully
---
funders/migrations/0012_auto_20180922_1609.py | 20 +++++++++++++
funders/models.py | 2 +-
journals/forms.py | 8 ++---
.../migrations/0041_auto_20180922_1609.py | 30 +++++++++++++++++++
journals/models.py | 6 ++--
partners/forms.py | 2 +-
.../migrations/0018_auto_20180922_1609.py | 20 +++++++++++++
partners/models.py | 2 +-
8 files changed, 80 insertions(+), 10 deletions(-)
create mode 100644 funders/migrations/0012_auto_20180922_1609.py
create mode 100644 journals/migrations/0041_auto_20180922_1609.py
create mode 100644 partners/migrations/0018_auto_20180922_1609.py
diff --git a/funders/migrations/0012_auto_20180922_1609.py b/funders/migrations/0012_auto_20180922_1609.py
new file mode 100644
index 000000000..de5b37811
--- /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 0fa4d8ef5..e88ea8427 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 6facc6eeb..6506e156d 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 000000000..148c117ef
--- /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 ea538baea..6858d5d59 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 02345d6c3..f4a94bd97 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 000000000..6ca67b78c
--- /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 b272aa171..7106748a9 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,
--
GitLab