Merge branch 'hotfix_JSC_20170522'

SciPost_v1/settings/local_JSC.py

+from .base import *
+
+# THE MAIN THING HERE
+DEBUG = True
+
+# Static and media
+STATIC_ROOT = '/Users/jscaux/Sites/SciPost.org/scipost_v1/local_files/static/'
+MEDIA_ROOT = '/Users/jscaux/Sites/SciPost.org/scipost_v1/local_files/media/'
+WEBPACK_LOADER['DEFAULT']['BUNDLE_DIR_NAME'] =\
+    '/Users/jscaux/Sites/SciPost.org/scipost_v1/local_files/static/bundles/'
+
+MAILCHIMP_API_USER = get_secret("MAILCHIMP_API_USER")
+MAILCHIMP_API_KEY = get_secret("MAILCHIMP_API_KEY")

production/constants.py

@@ -12,6 +12,7 @@ PRODUCTION_EVENTS = (
     ('message_supervisor_to_officer', 'Message from Supervisor to Officer'),
     ('message_officer_to_supervisor', 'Message from Officer to Supervisor'),
     ('proofs_produced', 'Proofs have been produced'),
+    ('proofs_checked_by_supervisor', 'Proofs have been checked by Supervisor'),
     ('proofs_sent_to_authors', 'Proofs sent to Authors'),
     ('proofs_returned_by_authors', 'Proofs returned by Authors'),
     ('corrections_implemented', 'Corrections implemented'),

production/migrations/0003_auto_20170522_1021.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-05-22 08:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('production', '0002_auto_20170517_1942'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='productionevent',
+            name='event',
+            field=models.CharField(choices=[('assigned_to_supervisor', 'Assigned by EdAdmin to Supervisor'), ('message_edadmin_to_supervisor', 'Message from EdAdmin to Supervisor'), ('message_supervisor_to_edadmin', 'Message from Supervisor to EdAdmin'), ('officer_tasked_with_proof_production', 'Supervisor tasked officer with proofs production'), ('message_supervisor_to_officer', 'Message from Supervisor to Officer'), ('message_officer_to_supervisor', 'Message from Officer to Supervisor'), ('proofs_produced', 'Proofs have been produced'), ('proofs_checked_by_supervisor', 'Proofs have been checked by Supervisor'), ('proofs_sent_to_authors', 'Proofs sent to Authors'), ('proofs_returned_by_authors', 'Proofs returned by Authors'), ('corrections_implemented', 'Corrections implemented'), ('authors_have_accepted_proofs', 'Authors have accepted proofs')], max_length=64),
+        ),
+    ]

submissions/constants.py

@@ -62,6 +62,7 @@ SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
     STATUS_RESUBMISSION_INCOMING,
     'assignment_failed',
     'resubmitted_rejected',
+    STATUS_RESUBMITTED_REJECTED,
     'rejected',
     'withdrawn',
 ]
@@ -70,6 +71,7 @@ SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
 SUBMISSION_STATUS_PUBLICLY_UNLISTED = SUBMISSION_STATUS_PUBLICLY_INVISIBLE + [
     'resubmitted',
     'resubmitted_rejected_visible',
+    STATUS_RESUBMITTED_REJECTED_VISIBLE,
     'published'
 ]