Merge branch 'hotfix_JSC_20170623'

partners/migrations/0013_auto_20170623_0806.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-23 06:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('partners', '0012_auto_20170612_2006'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contact',
+            name='title',
+            field=models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4),
+        ),
+        migrations.AlterField(
+            model_name='prospectivecontact',
+            name='title',
+            field=models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4),
+        ),
+    ]

production/migrations/0008_auto_20170623_0833.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-23 06:33
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('production', '0007_auto_20170610_1202'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='productionevent',
+            options={'ordering': ['noted_on']},
+        ),
+    ]

production/models.py

@@ -44,6 +44,9 @@ class ProductionEvent(models.Model):
 
     objects = ProductionEventManager()
 
+    class Meta:
+        ordering = ['noted_on']
+
     def __str__(self):
         return '%s: %s' % (str(self.stream.submission), self.get_event_display())
 

scipost/constants.py

@@ -148,6 +148,7 @@ TITLE_CHOICES = (
     ('DR', 'Dr'),
     ('MR', 'Mr'),
     ('MRS', 'Mrs'),
+    ('MS', 'Ms'),
 )
 
 INVITATION_EDITORIAL_FELLOW = 'F'

scipost/migrations/0056_auto_20170623_0806.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-23 06:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('scipost', '0055_auto_20170519_0937'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contributor',
+            name='title',
+            field=models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4),
+        ),
+        migrations.AlterField(
+            model_name='draftinvitation',
+            name='title',
+            field=models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4),
+        ),
+        migrations.AlterField(
+            model_name='registrationinvitation',
+            name='title',
+            field=models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4),
+        ),
+    ]

submissions/migrations/0046_auto_20170623_0806.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-06-23 06:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submissions', '0045_auto_20170608_1710'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='refereeinvitation',
+            name='title',
+            field=models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4),
+        ),
+    ]