diff --git a/SciPost_v1/settings/base.py b/SciPost_v1/settings/base.py
index 6ab1e2093cdd2ef7dc677d0ecaee47a58badcc50..3a2a26e166f5db576aa70102b2ff4ec399b82d76 100644
--- a/SciPost_v1/settings/base.py
+++ b/SciPost_v1/settings/base.py
@@ -389,7 +389,7 @@ LOGGING = {
# Celery scheduled tasks
CELERY_RESULT_BACKEND = 'django-db'
-CELERY_BROKER_URL = 'amqp://localhost'
+CELERY_BROKER_URL = get_secret('CELERY_BROKER_URL')
CELERY_IMPORTS = ('submissions.tasks', 'metacore.tasks')
diff --git a/SciPost_v1/settings/local_jorran.py b/SciPost_v1/settings/local_jorran.py
index 456c6e115c354cf25e0a8e825af2e34338643788..0a88858c4f0340027858aea302a401079c8d07e7 100644
--- a/SciPost_v1/settings/local_jorran.py
+++ b/SciPost_v1/settings/local_jorran.py
@@ -3,13 +3,6 @@ from .base import *
# THE MAIN THING HERE
DEBUG = True
-# Debug toolbar settings
-INSTALLED_APPS += (
- 'debug_toolbar',
-)
-MIDDLEWARE += (
- 'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
INTERNAL_IPS = ['127.0.0.1', '::1']
# Static and media
diff --git a/SciPost_v1/signalprocessors.py b/SciPost_v1/signalprocessors.py
index 580efaa545400187fdf03036a9e04f8c76fb1823..cfab275a7cab394a367deb183abefb8a20818d0b 100644
--- a/SciPost_v1/signalprocessors.py
+++ b/SciPost_v1/signalprocessors.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from haystack import signals
from haystack.exceptions import NotHandled
diff --git a/SciPost_v1/urls.py b/SciPost_v1/urls.py
index 0840aa4ce343a40cc0a942c058e01a17201b5596..1e99be8d609e9b9d7f2a7c9a82a403cd1f7497d7 100644
--- a/SciPost_v1/urls.py
+++ b/SciPost_v1/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/SciPost_v1/wsgi.py b/SciPost_v1/wsgi.py
index 2dd460be75aca0ce80eff67ab587d25e25552077..db6ab8b7bf57f98a5f50008f9ff12fa4a73d3525 100644
--- a/SciPost_v1/wsgi.py
+++ b/SciPost_v1/wsgi.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
"""
WSGI config for SciPost_v1 project.
diff --git a/SciPost_v1/wsgi_prod.py b/SciPost_v1/wsgi_prod.py
index 305741b4b80439a65edb2959bdcdf22436fc179a..3d7cffdf5f8f597fe2d2ee2630a21c13dacc4ba1 100644
--- a/SciPost_v1/wsgi_prod.py
+++ b/SciPost_v1/wsgi_prod.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
"""
WSGI config for SciPost_v1 project on Production (ip: 87.247.240.135).
"""
diff --git a/SciPost_v1/wsgi_staging.py b/SciPost_v1/wsgi_staging.py
index 02e689c1c438d4728d1f720f49f8ca99eeb1b298..2182410569aa42a639e00a416128330671069d49 100644
--- a/SciPost_v1/wsgi_staging.py
+++ b/SciPost_v1/wsgi_staging.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
"""
WSGI config for SciPost_v1 project on Staging (jdewit.webfactional.com).
"""
diff --git a/SciPost_v1/wsgi_staging_2.py b/SciPost_v1/wsgi_staging_2.py
index 685c5e83352d022e0ca40efce6de49a493ddb3eb..f6a79aa21097ff6d6241d3c3dfa30a0bd1c9332e 100644
--- a/SciPost_v1/wsgi_staging_2.py
+++ b/SciPost_v1/wsgi_staging_2.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
"""
WSGI config for SciPost_v1 project on Production (ip: 87.247.240.135).
"""
diff --git a/affiliations/__init__.py b/affiliations/__init__.py
index 010e7870a94436d970afeb25f813b633faeaf4c4..9a7f04e77f48c34bf0dc19460d4c6e15be55b1cb 100644
--- a/affiliations/__init__.py
+++ b/affiliations/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/admin.py b/affiliations/admin.py
index 2187f27ad02dc12a9ab40510f020c1bf807df4bc..fc4aa88c963abfdd8e52f67fe6c44d7f7ba9740b 100644
--- a/affiliations/admin.py
+++ b/affiliations/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/apps.py b/affiliations/apps.py
index d3eb63f813fa1d58c9ef006bea0f60da5f8fbfe4..3a8cdd2ae752f6b992b9afc92af218093745b56a 100644
--- a/affiliations/apps.py
+++ b/affiliations/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/constants.py b/affiliations/constants.py
index c14aaca021df81dd1b3e957949e5f9dc916f471e..8143c7714a84d4212ab2033d878c3f1522566fc9 100644
--- a/affiliations/constants.py
+++ b/affiliations/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/factories.py b/affiliations/factories.py
index 8bd88bbbc4e545cf9ce74f49fc06b2268c13e003..1d1f7b7fe7872d48fee04c5ef4850cea9c406a5d 100644
--- a/affiliations/factories.py
+++ b/affiliations/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/forms.py b/affiliations/forms.py
index b601ab5e907d306d551ff99e3c0f46baaaaae959..41b281de326282a01d7c56c6ac7318af868402a0 100644
--- a/affiliations/forms.py
+++ b/affiliations/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/managers.py b/affiliations/managers.py
index 11d16f9ecedba5af4c15825c04fd3a594c28193b..e81d9e69bdced561b54e20426268be0934d36dd1 100644
--- a/affiliations/managers.py
+++ b/affiliations/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/models.py b/affiliations/models.py
index 4d70d28108321903e9aa4baa89f5314cf6623f82..5bb05f92ecc0971936f30f21818613315aa7372c 100644
--- a/affiliations/models.py
+++ b/affiliations/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/signals.py b/affiliations/signals.py
index e36a5984c04749d74396aa8e22a8d069a070f3e0..7108f9c09edb13b2a03aabcb70cae981a5cd196d 100644
--- a/affiliations/signals.py
+++ b/affiliations/signals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/tests.py b/affiliations/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/affiliations/tests.py
+++ b/affiliations/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/urls.py b/affiliations/urls.py
index 22b6fc62eb3081d47741c2169c86467015116523..5221f5d8ea7ab48e491885a2f2cacac743ff0bf4 100644
--- a/affiliations/urls.py
+++ b/affiliations/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/affiliations/views.py b/affiliations/views.py
index 9de5a4d024652bae71457646716549a6560fe995..3107fdf2cfda6f972a654697dafaac8ff7db4d97 100644
--- a/affiliations/views.py
+++ b/affiliations/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/colleges/admin.py b/colleges/admin.py
index 2ee73a50126634a17b0c1ff15f184dadfe8ef647..1812d1c052baf4a6a1573118a17a5c887fb286ec 100644
--- a/colleges/admin.py
+++ b/colleges/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/colleges/apps.py b/colleges/apps.py
index ed191537c9dc040b91a1bf12515435e5fb2a810a..4049c98fdade4dbaa915f256c85bb2b247f0d15c 100644
--- a/colleges/apps.py
+++ b/colleges/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/colleges/constants.py b/colleges/constants.py
index 55bfe9d9e16e76a6c7b85b882a88219b09d51df9..46625c019ecc87e79119e7456f672264e57c39c0 100644
--- a/colleges/constants.py
+++ b/colleges/constants.py
@@ -1,8 +1,12 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
POTENTIAL_FELLOWSHIP_IDENTIFIED = 'identified'
+POTENTIAL_FELLOWSHIP_NOMINATED = 'nominated'
+POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING = 'electionvoteongoing'
+POTENTIAL_FELLOWSHIP_ELECTED = 'elected'
+POTENTIAL_FELLOWSHIP_NOT_ELECTED = 'notelected'
POTENTIAL_FELLOWSHIP_INVITED = 'invited'
POTENTIAL_FELLOWSHIP_REINVITED = 'reinvited'
POTENTIAL_FELLOWSHIP_MULTIPLY_REINVITED = 'multiplyreinvited'
@@ -17,6 +21,10 @@ POTENTIAL_FELLOWSHIP_SCIPOST_EMERITUS = 'emeritus'
POTENTIAL_FELLOWSHIP_STATUSES = (
(POTENTIAL_FELLOWSHIP_IDENTIFIED, 'Identified as potential Fellow'),
+ (POTENTIAL_FELLOWSHIP_NOMINATED, 'Nominated for Fellowship'),
+ (POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING, 'Election vote ongoing'),
+ (POTENTIAL_FELLOWSHIP_ELECTED, 'Elected by the College'),
+ (POTENTIAL_FELLOWSHIP_NOT_ELECTED, 'Not elected by the College'),
(POTENTIAL_FELLOWSHIP_INVITED, 'Invited to become Fellow'),
(POTENTIAL_FELLOWSHIP_REINVITED, 'Reinvited after initial invitation'),
(POTENTIAL_FELLOWSHIP_MULTIPLY_REINVITED, 'Multiply reinvited'),
@@ -33,6 +41,9 @@ potential_fellowship_statuses_dict = dict(POTENTIAL_FELLOWSHIP_STATUSES)
POTENTIAL_FELLOWSHIP_EVENT_DEFINED = 'defined'
+POTENTIAL_FELLOWSHIP_EVENT_NOMINATED = 'nominated'
+POTENTIAL_FELLOWSHIP_EVENT_VOTED_ON = 'votedon'
+POTENTIAL_FELLOWSHIP_EVENT_ELECTED = 'elected'
POTENTIAL_FELLOWSHIP_EVENT_EMAILED = 'emailed'
POTENTIAL_FELLOWSHIP_EVENT_RESPONDED = 'responded'
POTENTIAL_FELLOWSHIP_EVENT_STATUSUPDATED = 'statusupdated'
@@ -41,6 +52,9 @@ POTENTIAL_FELLOWSHIP_EVENT_DEACTIVATION = 'deactivation'
POTENTIAL_FELLOWSHIP_EVENTS = (
(POTENTIAL_FELLOWSHIP_EVENT_DEFINED, 'Defined in database'),
+ (POTENTIAL_FELLOWSHIP_EVENT_NOMINATED, 'Nominated'),
+ (POTENTIAL_FELLOWSHIP_EVENT_VOTED_ON, 'Voted on'),
+ (POTENTIAL_FELLOWSHIP_EVENT_ELECTED, 'Elected'),
(POTENTIAL_FELLOWSHIP_EVENT_EMAILED, 'Emailed with invitation'),
(POTENTIAL_FELLOWSHIP_EVENT_RESPONDED, 'Response received'),
(POTENTIAL_FELLOWSHIP_EVENT_STATUSUPDATED, 'Status updated'),
diff --git a/colleges/factories.py b/colleges/factories.py
index 1f7a3648dd24853e0ea5590eceb5e6c000807915..533450af658a9ded940282b9d0856224bfcc5538 100644
--- a/colleges/factories.py
+++ b/colleges/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/colleges/forms.py b/colleges/forms.py
index b08cb388b4551f946860dfe5ff24249aac091986..a09f430abfba5c76604b2a8fbff4d81b5614fe81 100644
--- a/colleges/forms.py
+++ b/colleges/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -10,9 +10,12 @@ from ajax_select.fields import AutoCompleteSelectField
from proceedings.models import Proceedings
from submissions.models import Submission
+from scipost.forms import RequestFormMixin
from scipost.models import Contributor
from .models import Fellowship, PotentialFellowship, PotentialFellowshipEvent
+from .constants import POTENTIAL_FELLOWSHIP_IDENTIFIED, POTENTIAL_FELLOWSHIP_NOMINATED,\
+ POTENTIAL_FELLOWSHIP_EVENT_DEFINED, POTENTIAL_FELLOWSHIP_EVENT_NOMINATED
class AddFellowshipForm(forms.ModelForm):
@@ -224,12 +227,36 @@ class FellowshipAddProceedingsForm(forms.ModelForm):
return fellowship
-class PotentialFellowshipForm(forms.ModelForm):
+class PotentialFellowshipForm(RequestFormMixin, forms.ModelForm):
profile = AutoCompleteSelectField('profile_lookup')
class Meta:
model = PotentialFellowship
- fields = ['profile', 'status']
+ fields = ['profile']
+
+ def save(self):
+ """
+ The default status is IDENTIFIED, which is appropriate
+ if the PotentialFellow was added directly by SciPost Admin.
+ But if the PotFel is nominated by somebody on the Advisory Board
+ or by an existing Fellow, the status is set to NOMINATED and
+ the person nominating is added to the list of in_agreement with election.
+ """
+ potfel = super().save()
+ nominated = self.request.user.groups.filter(name__in=[
+ 'Advisory Board', 'Editorial College']).exists()
+ if nominated:
+ potfel.status = POTENTIAL_FELLOWSHIP_NOMINATED
+ potfel.in_agreement.add(self.request.user.contributor)
+ event = POTENTIAL_FELLOWSHIP_EVENT_NOMINATED
+ else:
+ potfel.status = POTENTIAL_FELLOWSHIP_IDENTIFIED
+ event = POTENTIAL_FELLOWSHIP_EVENT_DEFINED
+ potfel.save()
+ newevent = PotentialFellowshipEvent(
+ potfel=potfel, event=event, noted_by=self.request.user.contributor)
+ newevent.save()
+ return potfel
class PotentialFellowshipStatusForm(forms.ModelForm):
diff --git a/colleges/management/commands/create_fellowships.py b/colleges/management/commands/create_fellowships.py
index f2e929247513f23db5f2d61a8ee8185626f6a3f9..4780996f6ff7006f3580478c34cf9152d6eb8c1d 100644
--- a/colleges/management/commands/create_fellowships.py
+++ b/colleges/management/commands/create_fellowships.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/colleges/managers.py b/colleges/managers.py
index 638887cb1cde17e3fe2f27168b3d2e1b49c62faf..67e450e0cd057ac2ac532955a241317339b4e59a 100644
--- a/colleges/managers.py
+++ b/colleges/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -6,6 +6,8 @@ from django.db import models
from django.db.models import Q
from django.utils import timezone
+from .constants import POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING
+
class FellowQuerySet(models.QuerySet):
def guests(self):
@@ -47,3 +49,23 @@ class FellowQuerySet(models.QuerySet):
return fellowships
except AttributeError:
return []
+
+
+class PotentialFellowshipQuerySet(models.QuerySet):
+ def vote_needed(self, contributor):
+ return self.filter(
+ profile__discipline=contributor.profile.discipline,
+ status=POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING
+ ).order_by('profile__last_name')
+
+ def to_vote_on(self, contributor):
+ return self.vote_needed(contributor).exclude(
+ Q(in_agreement__in=[contributor]) |
+ Q(in_abstain__in=[contributor]) |
+ Q(in_disagreement__in=[contributor]))
+
+ def voted_on(self, contributor):
+ return self.vote_needed(contributor).filter(
+ Q(in_agreement__in=[contributor]) |
+ Q(in_abstain__in=[contributor]) |
+ Q(in_disagreement__in=[contributor]))
diff --git a/colleges/migrations/0011_auto_20190113_1942.py b/colleges/migrations/0011_auto_20190113_1942.py
new file mode 100644
index 0000000000000000000000000000000000000000..0db9bd1d5e7b000fe0966ddcb4caa67dd3c844a2
--- /dev/null
+++ b/colleges/migrations/0011_auto_20190113_1942.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-13 18:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('colleges', '0010_auto_20180917_2117'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='potentialfellowship',
+ options={'ordering': ['profile__last_name']},
+ ),
+ migrations.AlterField(
+ model_name='potentialfellowship',
+ name='status',
+ field=models.CharField(choices=[('identified', 'Identified as potential Fellow'), ('nominated', 'Nominated for Fellowship'), ('elected', 'Elected by the College'), ('notelected', 'Not elected by the College'), ('invited', 'Invited to become Fellow'), ('reinvited', 'Reinvited after initial invitation'), ('multiplyreinvited', 'Multiply reinvited'), ('declined', 'Declined the invitation'), ('unresponsive', 'Marked as unresponsive'), ('retired', 'Retired'), ('deceased', 'Deceased'), ('interested', 'Marked as interested, Fellowship being set up'), ('registered', 'Registered as Contributor'), ('activeincollege', 'Currently active in a College'), ('emeritus', 'SciPost Emeritus')], default='identified', max_length=32),
+ ),
+ ]
diff --git a/colleges/migrations/0012_auto_20190114_0550.py b/colleges/migrations/0012_auto_20190114_0550.py
new file mode 100644
index 0000000000000000000000000000000000000000..92dd60b699c529761115c6622524b3434afe87dc
--- /dev/null
+++ b/colleges/migrations/0012_auto_20190114_0550.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-14 04:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0018_contributor_duplicate_of'),
+ ('colleges', '0011_auto_20190113_1942'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='potentialfellowship',
+ name='elected',
+ field=models.NullBooleanField(),
+ ),
+ migrations.AddField(
+ model_name='potentialfellowship',
+ name='in_abstain',
+ field=models.ManyToManyField(blank=True, related_name='in_abstain_with_election', to='scipost.Contributor'),
+ ),
+ migrations.AddField(
+ model_name='potentialfellowship',
+ name='in_agreement',
+ field=models.ManyToManyField(blank=True, related_name='in_agreement_with_election', to='scipost.Contributor'),
+ ),
+ migrations.AddField(
+ model_name='potentialfellowship',
+ name='in_disagreement',
+ field=models.ManyToManyField(blank=True, related_name='in_disagreement_with_election', to='scipost.Contributor'),
+ ),
+ migrations.AddField(
+ model_name='potentialfellowship',
+ name='voting_deadline',
+ field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='voting deadline'),
+ ),
+ migrations.AlterField(
+ model_name='potentialfellowship',
+ name='status',
+ field=models.CharField(choices=[('identified', 'Identified as potential Fellow'), ('nominated', 'Nominated for Fellowship'), ('electionvoteongoing', 'Election vote ongoing'), ('elected', 'Elected by the College'), ('notelected', 'Not elected by the College'), ('invited', 'Invited to become Fellow'), ('reinvited', 'Reinvited after initial invitation'), ('multiplyreinvited', 'Multiply reinvited'), ('declined', 'Declined the invitation'), ('unresponsive', 'Marked as unresponsive'), ('retired', 'Retired'), ('deceased', 'Deceased'), ('interested', 'Marked as interested, Fellowship being set up'), ('registered', 'Registered as Contributor'), ('activeincollege', 'Currently active in a College'), ('emeritus', 'SciPost Emeritus')], default='identified', max_length=32),
+ ),
+ ]
diff --git a/colleges/migrations/0013_auto_20190117_1935.py b/colleges/migrations/0013_auto_20190117_1935.py
new file mode 100644
index 0000000000000000000000000000000000000000..d6cd8ee25dd7bcf47d6776f921f7b0a54a318e98
--- /dev/null
+++ b/colleges/migrations/0013_auto_20190117_1935.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-17 18:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('colleges', '0012_auto_20190114_0550'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='potentialfellowshipevent',
+ name='event',
+ field=models.CharField(choices=[('defined', 'Defined in database'), ('nominated', 'Nominated'), ('votedon', 'Voted on'), ('elected', 'Elected'), ('emailed', 'Emailed with invitation'), ('responded', 'Response received'), ('statusupdated', 'Status updated'), ('comment', 'Comment'), ('deactivation', 'Deactivation: not considered anymore')], max_length=32),
+ ),
+ ]
diff --git a/colleges/models.py b/colleges/models.py
index 0cbe4e520ffc262e77d6798134f9281c95662b49..fc9048a71e1c20320e7dedf4944d5506f8576c8f 100644
--- a/colleges/models.py
+++ b/colleges/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -10,7 +10,7 @@ from django.utils import timezone
from .constants import POTENTIAL_FELLOWSHIP_STATUSES,\
POTENTIAL_FELLOWSHIP_IDENTIFIED, POTENTIAL_FELLOWSHIP_EVENTS
-from .managers import FellowQuerySet
+from .managers import FellowQuerySet, PotentialFellowshipQuerySet
from profiles.models import Profile
@@ -72,21 +72,45 @@ class Fellowship(TimeStampedModel):
class PotentialFellowship(models.Model):
"""
A PotentialFellowship is defined when a researcher has been identified by
- Admin or EdAdmin as a potential member of an Editorial College.
+ Admin or EdAdmin as a potential member of an Editorial College,
+ or when a current Advisory Board member or Fellow nominates the person.
It is linked to Profile as ForeignKey and not as OneToOne, since the same
person can eventually be approached on different occasions.
- COMMENT: Why is this only nonregistered people only?
+ Using Profile allows to treat both registered Contributors
+ and non-registered people equally well.
"""
profile = models.ForeignKey('profiles.Profile', on_delete=models.CASCADE)
status = models.CharField(max_length=32, choices=POTENTIAL_FELLOWSHIP_STATUSES,
default=POTENTIAL_FELLOWSHIP_IDENTIFIED)
+ in_agreement = models.ManyToManyField(
+ 'scipost.Contributor',
+ related_name='in_agreement_with_election', blank=True)
+ in_abstain = models.ManyToManyField(
+ 'scipost.Contributor',
+ related_name='in_abstain_with_election', blank=True)
+ in_disagreement = models.ManyToManyField(
+ 'scipost.Contributor',
+ related_name='in_disagreement_with_election', blank=True)
+ voting_deadline = models.DateTimeField('voting deadline', default=timezone.now)
+ elected = models.NullBooleanField()
+
+ objects = PotentialFellowshipQuerySet.as_manager()
+
+ class Meta:
+ ordering = ['profile__last_name']
def __str__(self):
return '%s, %s' % (self.profile.__str__(), self.get_status_display())
+ def latest_event_details(self):
+ event = self.potentialfellowshipevent_set.order_by('-noted_on').first()
+ if not event:
+ return 'No event recorded'
+ return '%s [%s]' % (event.get_event_display(), event.noted_on.strftime('%Y-%m-%d'))
+
class PotentialFellowshipEvent(models.Model):
"""Any event directly related to a PotentialFellowship instance registered as plain text."""
@@ -101,5 +125,7 @@ class PotentialFellowshipEvent(models.Model):
blank=True, null=True)
def __str__(self):
- return '%s, %s %s: %s' % (self.potfel.last_name, self.potfel.get_title_display(),
- self.potfel.first_name, self.get_event_display())
+ return '%s, %s %s: %s' % (self.potfel.profile.last_name,
+ self.potfel.profile.get_title_display(),
+ self.potfel.profile.first_name,
+ self.get_event_display())
diff --git a/colleges/permissions.py b/colleges/permissions.py
index 1130c79fce04a6cd65a74abb9d782f8b62922f68..3ded6a384b3a15141acb4fde6a740f7b41ac4e74 100644
--- a/colleges/permissions.py
+++ b/colleges/permissions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/colleges/templates/colleges/_potentialfellowship_card.html b/colleges/templates/colleges/_potentialfellowship_card.html
index 35737a4620c79577cd08ea756b3520d51523915c..9225b7042363af21b72c01cd51f8460dae11af8c 100644
--- a/colleges/templates/colleges/_potentialfellowship_card.html
+++ b/colleges/templates/colleges/_potentialfellowship_card.html
@@ -1,5 +1,7 @@
{% load bootstrap %}
+{% load scipost_extras %}
+
<div class="card-body">
<div class="row">
<div class="col-12">
@@ -22,6 +24,9 @@
</div>
</div>
</div>
+
+ {% if perms.scipost.can_manage_college_composition %}
+ <h3 class="highlight">Admin actions</h3>
<div class="row">
<div class="col-md-6">
<ul>
@@ -40,18 +45,73 @@
</form>
</div>
</div>
+ {% endif %}
+ {% if perms.scipost.can_manage_college_composition %}
<div class="row">
- <div class="col-md-6">
- <h3>Add an event for this Potential Fellowship</h3>
- <form class="d-block mt-2 mb-3" action="{% url 'colleges:potential_fellowship_event_create' pk=potfel.id %}" method="post">
- {% csrf_token %}
- {{ pfevent_form|bootstrap }}
- <input type="submit" name="submit" value="Submit" class="btn btn-outline-secondary">
- </form>
+ <div class="col-12">
+ <h3 class="highlight">Voting results</h3>
+ <p>
+ Voting Fellows' matching expertises are marked in <span class="bg-success">green</span>.
+ </p>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-4">
+ <table class="table">
+ <tr><th>Agreed</th></tr>
+ {% for fellow in potfel.in_agreement.all %}
+ <tr>
+ <td>{{ fellow }}</td>
+ <td>{% for expertise in fellow.profile.expertises %}
+ <div class="single d-inline{% if expertise in potfel.profile.expertises %} bg-success{% endif %}" data-specialization="{{expertise|lower}}" data-toggle="tooltip" data-placement="bottom" title="{{expertise|get_specialization_display}}">{{expertise|get_specialization_code}}</div>
+ {% endfor %}
+ </td>
+ </tr>
+ {% empty %}
+ <tr><td>No Fellow has agreed</td></tr>
+ {% endfor %}
+ </table>
+ </div>
+ <div class="col-4">
+ <table class="table">
+ <tr><th>Abstained</th></tr>
+ {% for fellow in potfel.in_abstain.all %}
+ <tr>
+ <td>{{ fellow }}</td>
+ <td>{% for expertise in fellow.profile.expertises %}
+ <div class="single d-inline{% if expertise in potfel.profile.expertises %} bg-success{% endif %}" data-specialization="{{expertise|lower}}" data-toggle="tooltip" data-placement="bottom" title="{{expertise|get_specialization_display}}">{{expertise|get_specialization_code}}</div>
+ {% endfor %}
+ </td>
+ </tr>
+ {% empty %}
+ <tr><td>No Fellow has abstained</td></tr>
+ {% endfor %}
+ </table>
+ </div>
+ <div class="col-4">
+ <table class="table">
+ <tr><th>Disagreed</th></tr>
+ {% for fellow in potfel.in_disagreement.all %}
+ <tr>
+ <td>{{ fellow }}</td>
+ <td>{% for expertise in fellow.profile.expertises %}
+ <div class="single d-inline{% if expertise in potfel.profile.expertises %} bg-success{% endif %}" data-specialization="{{expertise|lower}}" data-toggle="tooltip" data-placement="bottom" title="{{expertise|get_specialization_display}}">{{expertise|get_specialization_code}}</div>
+ {% endfor %}
+ </td>
+ </tr>
+ {% empty %}
+ <tr><td>No Fellow has disagreed</td></tr>
+ {% endfor %}
+ </table>
</div>
+ </div>
+ {% endif %}
+
+ {% if perms.scipost.can_manage_college_composition %}
+ <h3 class="highlight">Events</h3>
+ <div class="row">
<div class="col-md-6">
- <h3>Events</h3>
<ul>
{% for event in potfel.potentialfellowshipevent_set.all %}
{% include 'colleges/_potentialfellowship_event_li.html' with event=event %}
@@ -60,5 +120,15 @@
{% endfor %}
</ul>
</div>
+
+ <div class="col-md-6">
+ <h3>Add an event for this Potential Fellowship</h3>
+ <form class="d-block mt-2 mb-3" action="{% url 'colleges:potential_fellowship_event_create' pk=potfel.id %}" method="post">
+ {% csrf_token %}
+ {{ pfevent_form|bootstrap }}
+ <input type="submit" name="submit" value="Submit" class="btn btn-outline-secondary">
+ </form>
+ </div>
</div>
+ {% endif %}
</div>
diff --git a/colleges/templates/colleges/_potentialfellowship_voting_table.html b/colleges/templates/colleges/_potentialfellowship_voting_table.html
new file mode 100644
index 0000000000000000000000000000000000000000..c0361456b5d40413b3777cb42316d929d799c778
--- /dev/null
+++ b/colleges/templates/colleges/_potentialfellowship_voting_table.html
@@ -0,0 +1,40 @@
+{% load scipost_extras %}
+{% load colleges_extras %}
+
+
+<table class="table">
+ {% for potfel in potfels_list %}
+ <tr>
+ <td><a href="{{ potfel.profile.get_absolute_url }}" target="_blank">{{ potfel.profile.last_name }}, {{ potfel.profile.get_title_display }} {{ potfel.profile.first_name }}</a></td>
+ <td>{{ potfel.profile.get_discipline_display }}</td>
+ <td>
+ {% for expertise in potfel.profile.expertises %}
+ <div class="single d-inline" data-specialization="{{expertise|lower}}" data-toggle="tooltip" data-placement="bottom" title="{{expertise|get_specialization_display}}">{{expertise|get_specialization_code}}</div>
+ {% endfor %}
+ </td>
+ <td>
+ <div class="opinionsDisplay mx-0 px-2 py-0">
+ Click to vote:
+ <form action="{% url 'colleges:vote_on_potential_fellowship' potfel_id=potfel.id vote='A' %}" method="post">
+ {% csrf_token %}
+ <input type="submit" class="agree" value="Agree {{ potfel.nr_A }} "/>
+ </form>
+ <form action="{% url 'colleges:vote_on_potential_fellowship' potfel_id=potfel.id vote='N' %}" method="post">
+ {% csrf_token %}
+ <input type="submit" class="notsure" value="Abstain {{ potfel.nr_N }}"/>
+ </form>
+ <form action="{% url 'colleges:vote_on_potential_fellowship' potfel_id=potfel.id vote='D' %}" method="post">
+ {% csrf_token %}
+ <input type="submit" class="disagree" value="Disagree {{ potfel.nr_D }}"/>
+ </form>
+ {% if request.user.contributor in potfel.in_agreement.all %}
+ <strong>(you have voted: Agreed)</strong>
+ {% elif request.user.contributor in potfel.in_abstain.all %}
+ <strong>(you have voted: Abstain)</strong>
+ {% elif request.user.contributor in potfel.in_disagreement.all %}
+ <strong>(you have voted: Disagree)</strong>
+ {% endif %}
+ </div>
+ </tr>
+ {% endfor %}
+</table>
diff --git a/colleges/templates/colleges/fellowship_details.html b/colleges/templates/colleges/fellowship_details.html
index b205807a27e2294183d3603e5d174a06ba73a979..ca88f489e032431685c5888959332722ecb5b4a5 100644
--- a/colleges/templates/colleges/fellowship_details.html
+++ b/colleges/templates/colleges/fellowship_details.html
@@ -68,22 +68,22 @@
</tr>
</thead>
<tbody>
- {% for fellowship in fellowship.sibling_fellowships %}
+ {% for fship in fellowship.sibling_fellowships %}
<tr>
- <td>{{ fellowship.id }}</td>
- <td>{{ fellowship.guest|yesno:"Guest fellowship,Regular fellowship"|safe }}</td>
+ <td>{{ fship.id }}</td>
+ <td>{{ fship.guest|yesno:"Guest fellowship,Regular fellowship"|safe }}</td>
<td>
- {% if fellowship.start_date %}
- from {{ fellowship.start_date }}
+ {% if fship.start_date %}
+ from {{ fship.start_date }}
{% endif %}
- {% if fellowship.until_date %}
- until {{ fellowship.until_date }}
+ {% if fship.until_date %}
+ until {{ fship.until_date }}
{% endif %}
- {% if not fellowship.start_date and not fellowship.until_date %}
+ {% if not fship.start_date and not fship.until_date %}
<i>Unlimited</i>
{% endif %}
</td>
- <td><a href="{{ fellowship.get_absolute_url }}">See details</a></td>
+ <td>{% if fship.id != fellowship.id %}<a href="{{ fellowship.get_absolute_url }}">See details</a>{% else %}(this page){% endif %}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/colleges/templates/colleges/potentialfellowship_form.html b/colleges/templates/colleges/potentialfellowship_form.html
index a80217f8798440bf22e9826c05c1ab07b9242826..3fddf5a32cfeaa4c15eeb3940e409e0df78b0707 100644
--- a/colleges/templates/colleges/potentialfellowship_form.html
+++ b/colleges/templates/colleges/potentialfellowship_form.html
@@ -18,6 +18,17 @@
<input type="submit" value="Submit" class="btn btn-primary">
</div>
</div>
+
+
+<div class="row">
+ <div class="col-12">
+ <h3 class="mb-2">Not found?</h3>
+ <p>Then add to our database by <a href="{% url 'profiles:profile_create' %}" target="_blank">creating a new Profile</a> (opens in new window).</p>
+ </div>
+</div>
+
+
+
{% endblock content %}
{% block footer_script %}
diff --git a/colleges/templates/colleges/potentialfellowship_list.html b/colleges/templates/colleges/potentialfellowship_list.html
index 0fa8ce291258052c86a14a6dc9d20599693b536f..dd3c9b301ad652bd24388f69975320f3ea296637 100644
--- a/colleges/templates/colleges/potentialfellowship_list.html
+++ b/colleges/templates/colleges/potentialfellowship_list.html
@@ -18,28 +18,80 @@ $(document).ready(function($) {
{% block pagetitle %}: Potential Fellowships{% endblock pagetitle %}
{% block content %}
+
+{% if perms.scipost.can_add_potentialfellowship %}
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Nominations</h3>
+ <p>
+ Do you know somebody qualified who could serve as a Fellow?<br/>
+ Nominate them by <a href="{% url 'colleges:potential_fellowship_create' %}">adding a Potential Fellowship</a>.
+ </p>
+
+ </div>
+</div>
+
+{% if potfels_to_vote_on or potfels_voted_on %}
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Ongoing elections</h3>
+ {% if potfels_to_vote_on %}
+ <h4>Nominations to vote on:</h4>
+ <div>
+ {% include 'colleges/_potentialfellowship_voting_table.html' with potfels_list=potfels_to_vote_on %}
+ </div>
+ {% endif %}
+ {% if potfels_voted_on %}
+ <h4>Nominations you have already voted on (you can revise your vote if you wish):</h4>
+ <div>
+ {% include 'colleges/_potentialfellowship_voting_table.html' with potfels_list=potfels_voted_on %}
+ </div>
+ {% endif %}
+ </div>
+</div>
+{% endif %}
+{% endif %}
+
<div class="row">
<div class="col-12">
- <a href="{% url 'colleges:potential_fellowship_create' %}">Add a Potential Fellowship</a>
- <br/><br/>
+ <h3 class="highlight">List of potential Fellowships</h3>
<p>
- <ul class="list-inline">
- <li class="list-inline-item">
- <a href="{% url 'colleges:potential_fellowships' %}">View all</a> or view by discipline/subject area:
+ <ul>
+ <li>
+ <a href="{% url 'colleges:potential_fellowships' %}">View all</a>
+ </li>
+ <li>
+ View by discipline/subject area:
+ <ul class="list-inline">
+ <li class="list-inline-item">
+ </li>
+ {% for discipline in subject_areas %}
+ <li class="list-inline-item">
+ <div class="dropdown">
+ <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton{{ discipline.0|cut:" " }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ discipline.0 }}</button>
+ <div class="dropdown-menu" aria-labelledby="dropdownMenuButton{{ discipline.0|cut:" " }}">
+ <a class="dropdown-item" href="{% url 'colleges:potential_fellowships' discipline=discipline.0|cut:' ' %}">View all in {{ discipline.0 }}</a>
+ {% for area in discipline.1 %}
+ <a class="dropdown-item" href="{% url 'colleges:potential_fellowships' discipline=discipline.0|cut:' ' expertise=area.0 %}">{{ area.0 }}</a>
+ {% endfor %}
+ </div>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
</li>
- {% for discipline in subject_areas %}
- <li class="list-inline-item">
+ <br/>
+ <li>
<div class="dropdown">
- <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton{{ discipline.0|cut:" " }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ discipline.0 }}</button>
- <div class="dropdown-menu" aria-labelledby="dropdownMenuButton{{ discipline.0|cut:" " }}">
- <a class="dropdown-item" href="{% url 'colleges:potential_fellowships' discipline=discipline.0|cut:' ' %}">View all in {{ discipline.0 }}</a>
- {% for area in discipline.1 %}
- <a class="dropdown-item" href="{% url 'colleges:potential_fellowships' discipline=discipline.0|cut:' ' expertise=area.0 %}">{{ area.0 }}</a>
+ <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButtonStatus" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Filter by status</button>
+ <div class="dropdown-menu" aria-labelledby="dropdownMenuButtonStatus">
+ <a class="dropdown-item" href="">View all</a>
+ {% for status in statuses %}
+ <a class="dropdown-item" href="?status={{ status.0 }}">{{ status.1 }}</a>
{% endfor %}
</div>
</div>
- </li>
- {% endfor %}
+ </li>
</ul>
</p>
</div>
@@ -47,8 +99,8 @@ $(document).ready(function($) {
<div class="row">
<div class="col-12">
- {% if view.kwargs.discipline %}
- <h3>Potential Fellowships in {{ view.kwargs.discipline }}{% if view.kwargs.expertise %}, {{ view.kwargs.expertise }}{% endif %}:</h3>
+ {% if view.kwargs.discipline or request.GET.status %}
+ <h3>Potential Fellowships {% if view.kwargs.discipline %}in {{ view.kwargs.discipline }}{% if view.kwargs.expertise %}, {{ view.kwargs.expertise }}{% endif %}{% endif %}{% if request.GET.status %} with status {{ request.GET.status }}{% endif %}:</h3>
<br/>
{% endif %}
<table class="table table-hover mb-5">
@@ -58,6 +110,7 @@ $(document).ready(function($) {
<th>Discipline</th>
<th>Expertises</th>
<th>Status</th>
+ <th>Latest event</th>
</tr>
</thead>
<tbody>
@@ -70,11 +123,12 @@ $(document).ready(function($) {
<div class="single d-inline" data-specialization="{{expertise|lower}}" data-toggle="tooltip" data-placement="bottom" title="{{expertise|get_specialization_display}}">{{expertise|get_specialization_code}}</div>
{% endfor %}
</td>
- <td style="color: #ffffff; background-color:{{ potfel.status|potfelstatuscolor }};">{{ potfel.get_status_display }}</td>
+ <td style="color: #ffffff; background-color:{{ potfel.status|potfelstatuscolor }};">{{ potfel.get_status_display }} <small>{% voting_results_display potfel %}</small></td>
+ <td>{{ potfel.latest_event_details }}</td>
</tr>
{% empty %}
<tr>
- <td colspan="4">No Potential Fellowships found</td>
+ <td colspan="5">No Potential Fellowships found</td>
</tr>
{% endfor %}
</tbody>
diff --git a/colleges/templatetags/colleges_extras.py b/colleges/templatetags/colleges_extras.py
index d0a10eceb9560daad8525c3d9e6be8ebda4c75ef..13a510c612de262bff017503d69c40950cb34f5d 100644
--- a/colleges/templatetags/colleges_extras.py
+++ b/colleges/templatetags/colleges_extras.py
@@ -1,11 +1,14 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
from django import template
from ..constants import (
- POTENTIAL_FELLOWSHIP_IDENTIFIED, POTENTIAL_FELLOWSHIP_INVITED, POTENTIAL_FELLOWSHIP_REINVITED,
+ POTENTIAL_FELLOWSHIP_IDENTIFIED, POTENTIAL_FELLOWSHIP_NOMINATED,
+ POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING,
+ POTENTIAL_FELLOWSHIP_ELECTED, POTENTIAL_FELLOWSHIP_NOT_ELECTED,
+ POTENTIAL_FELLOWSHIP_INVITED, POTENTIAL_FELLOWSHIP_REINVITED,
POTENTIAL_FELLOWSHIP_MULTIPLY_REINVITED, POTENTIAL_FELLOWSHIP_DECLINED,
POTENTIAL_FELLOWSHIP_UNRESPONSIVE, POTENTIAL_FELLOWSHIP_RETIRED, POTENTIAL_FELLOWSHIP_DECEASED,
POTENTIAL_FELLOWSHIP_INTERESTED, POTENTIAL_FELLOWSHIP_REGISTERED,
@@ -23,6 +26,14 @@ def potfelstatuscolor(status):
color = '#333333'
if status == POTENTIAL_FELLOWSHIP_IDENTIFIED:
color = hslColorWheel(12, 8)
+ elif status == POTENTIAL_FELLOWSHIP_NOMINATED:
+ color = 'Orange'
+ elif status == POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING:
+ color = 'DodgerBlue'
+ elif status == POTENTIAL_FELLOWSHIP_ELECTED:
+ color = 'MediumSeaGreen'
+ elif status == POTENTIAL_FELLOWSHIP_NOT_ELECTED:
+ color = 'Tomato'
elif status == POTENTIAL_FELLOWSHIP_INVITED:
color = hslColorWheel(12, 9)
elif status == POTENTIAL_FELLOWSHIP_REINVITED:
@@ -46,3 +57,13 @@ def potfelstatuscolor(status):
elif status == POTENTIAL_FELLOWSHIP_SCIPOST_EMERITUS:
color = hslColorWheel(12, 4, 40, 40)
return color
+
+
+@register.simple_tag
+def voting_results_display(potfel):
+ if potfel.status == POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING:
+ return ' Agree: %s, Abstain: %s, Disagree: %s' % (
+ potfel.in_agreement.count(),
+ potfel.in_abstain.count(),
+ potfel.in_disagreement.count())
+ return ''
diff --git a/colleges/tests.py b/colleges/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/colleges/tests.py
+++ b/colleges/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/colleges/urls.py b/colleges/urls.py
index dc6fb8c3501531edd64a093e1e439306300ff2a8..e26910dd19d1329322522ec495aed30c9c82233e 100644
--- a/colleges/urls.py
+++ b/colleges/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -69,6 +69,11 @@ urlpatterns = [
views.PotentialFellowshipEventCreateView.as_view(),
name='potential_fellowship_event_create'
),
+ url(
+ r'^potentialfellowships/(?P<potfel_id>[0-9]+)/vote/(?P<vote>[AND])/$',
+ views.vote_on_potential_fellowship,
+ name='vote_on_potential_fellowship'
+ ),
url(
r'^potentialfellowships/(?P<pk>[0-9]+)/email_initial/$',
views.PotentialFellowshipInitialEmailView.as_view(),
diff --git a/colleges/views.py b/colleges/views.py
index d62a106bc805a2ff34c0c6ce49b1fb562254e153..10b0070361a8917515cb6e7d5663a487ecec7b41 100644
--- a/colleges/views.py
+++ b/colleges/views.py
@@ -1,11 +1,13 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
-from django.shortcuts import get_object_or_404, render, redirect
from django.core.urlresolvers import reverse, reverse_lazy
+from django.db.models import Count
+from django.http import Http404
+from django.shortcuts import get_object_or_404, render, redirect
from django.utils import timezone
from django.utils.decorators import method_decorator
from django.views.generic.detail import DetailView
@@ -14,9 +16,10 @@ from django.views.generic.list import ListView
from submissions.models import Submission
-from .constants import POTENTIAL_FELLOWSHIP_INVITED, potential_fellowship_statuses_dict,\
- POTENTIAL_FELLOWSHIP_EVENT_EMAILED, POTENTIAL_FELLOWSHIP_EVENT_STATUSUPDATED,\
- POTENTIAL_FELLOWSHIP_EVENT_COMMENT
+from .constants import POTENTIAL_FELLOWSHIP_STATUSES,\
+ POTENTIAL_FELLOWSHIP_INVITED, potential_fellowship_statuses_dict,\
+ POTENTIAL_FELLOWSHIP_EVENT_VOTED_ON, POTENTIAL_FELLOWSHIP_EVENT_EMAILED,\
+ POTENTIAL_FELLOWSHIP_EVENT_STATUSUPDATED, POTENTIAL_FELLOWSHIP_EVENT_COMMENT
from .forms import FellowshipForm, FellowshipTerminateForm, FellowshipRemoveSubmissionForm,\
FellowshipAddSubmissionForm, AddFellowshipForm, SubmissionAddFellowshipForm,\
FellowshipRemoveProceedingsForm, FellowshipAddProceedingsForm, SubmissionAddVotingFellowForm,\
@@ -25,7 +28,7 @@ from .forms import FellowshipForm, FellowshipTerminateForm, FellowshipRemoveSubm
from .models import Fellowship, PotentialFellowship, PotentialFellowshipEvent
from scipost.constants import SCIPOST_SUBJECT_AREAS
-from scipost.mixins import PermissionsMixin, PaginationMixin
+from scipost.mixins import PermissionsMixin, PaginationMixin, RequestViewMixin
from mails.forms import EmailTemplateForm
from mails.views import MailView
@@ -302,17 +305,17 @@ def fellowship_add_proceedings(request, id):
# Potential Fellowships
-class PotentialFellowshipCreateView(PermissionsMixin, CreateView):
+class PotentialFellowshipCreateView(PermissionsMixin, RequestViewMixin, CreateView):
"""
Formview to create a new Potential Fellowship.
"""
- permission_required = 'scipost.can_manage_college_composition'
+ permission_required = 'scipost.can_add_potentialfellowship'
form_class = PotentialFellowshipForm
template_name = 'colleges/potentialfellowship_form.html'
success_url = reverse_lazy('colleges:potential_fellowships')
-class PotentialFellowshipUpdateView(PermissionsMixin, UpdateView):
+class PotentialFellowshipUpdateView(PermissionsMixin, RequestViewMixin, UpdateView):
"""
Formview to update a Potential Fellowship.
"""
@@ -357,7 +360,7 @@ class PotentialFellowshipListView(PermissionsMixin, PaginationMixin, ListView):
"""
List the PotentialFellowship object instances.
"""
- permission_required = 'scipost.can_manage_college_composition'
+ permission_required = 'scipost.can_view_potentialfellowship_list'
model = PotentialFellowship
paginate_by = 25
@@ -370,16 +373,25 @@ class PotentialFellowshipListView(PermissionsMixin, PaginationMixin, ListView):
queryset = queryset.filter(profile__discipline=self.kwargs['discipline'].lower())
if self.kwargs.get('expertise', None):
queryset = queryset.filter(profile__expertises__contains=[self.kwargs['expertise']])
+ if self.request.GET.get('status', None):
+ queryset = queryset.filter(status=self.request.GET.get('status'))
return queryset
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
+ context['potfels_to_vote_on'] = PotentialFellowship.objects.to_vote_on(
+ self.request.user.contributor).annotate(
+ nr_A=Count('in_agreement'), nr_N=Count('in_abstain'), nr_D=Count('in_disagreement'))
+ context['potfels_voted_on'] = PotentialFellowship.objects.voted_on(
+ self.request.user.contributor).annotate(
+ nr_A=Count('in_agreement'), nr_N=Count('in_abstain'), nr_D=Count('in_disagreement'))
context['subject_areas'] = SCIPOST_SUBJECT_AREAS
+ context['statuses'] = POTENTIAL_FELLOWSHIP_STATUSES
return context
class PotentialFellowshipDetailView(PermissionsMixin, DetailView):
- permission_required = 'scipost.can_manage_college_composition'
+ permission_required = 'scipost.can_view_potentialfellowship_list'
model = PotentialFellowship
def get_context_data(self, *args, **kwargs):
@@ -389,6 +401,31 @@ class PotentialFellowshipDetailView(PermissionsMixin, DetailView):
return context
+@login_required
+@permission_required('scipost.can_vote_on_potentialfellowship', raise_exception=True)
+def vote_on_potential_fellowship(request, potfel_id, vote):
+ potfel = get_object_or_404(PotentialFellowship, pk=potfel_id)
+ potfel.in_agreement.remove(request.user.contributor)
+ potfel.in_abstain.remove(request.user.contributor)
+ potfel.in_disagreement.remove(request.user.contributor)
+ if vote == 'A':
+ potfel.in_agreement.add(request.user.contributor)
+ comments = 'Voted Agree'
+ elif vote == 'N':
+ potfel.in_abstain.add(request.user.contributor)
+ comments = 'Voted Abstain'
+ elif vote == 'D':
+ potfel.in_disagreement.add(request.user.contributor)
+ comments = 'Voted Disagree'
+ else:
+ raise Http404
+ newevent = PotentialFellowshipEvent(
+ potfel=potfel, event=POTENTIAL_FELLOWSHIP_EVENT_VOTED_ON,
+ comments=comments, noted_by=request.user.contributor)
+ newevent.save()
+ return redirect(reverse('colleges:potential_fellowships'))
+
+
class PotentialFellowshipInitialEmailView(PermissionsMixin, MailView):
"""Send a templated email to a Potential Fellow."""
diff --git a/commentaries/admin.py b/commentaries/admin.py
index 5529e562936a4a58479d2b6b6d6370eee1e047bc..348a3a9c9e86e9b22583dd2fb54328cf1a1a23a3 100644
--- a/commentaries/admin.py
+++ b/commentaries/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/constants.py b/commentaries/constants.py
index cdcef185b0b8244db3827a6cf9f183f9b1320830..2262eb16df2ad2dc70af95c91682926d26723739 100644
--- a/commentaries/constants.py
+++ b/commentaries/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/factories.py b/commentaries/factories.py
index 3a56f5be4b2a06389f904ad3757d8de65568439c..a1be3076f30033dad18bae47dbcf9a40ec321295 100644
--- a/commentaries/factories.py
+++ b/commentaries/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/forms.py b/commentaries/forms.py
index deb70244856c158a426dd2e7b09d6904a4f11aee..3c412e1141cd21e7ed98f6af5119f30299da80ed 100644
--- a/commentaries/forms.py
+++ b/commentaries/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/management/commands/create_commentaries.py b/commentaries/management/commands/create_commentaries.py
index f6df54fb280d2a29f8aba80e097bfe0748e592f9..b7c09851b8e06e50ee4342355b2e7c7c7798a678 100644
--- a/commentaries/management/commands/create_commentaries.py
+++ b/commentaries/management/commands/create_commentaries.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/managers.py b/commentaries/managers.py
index 4c5b30b077eafc9e735f0338668d3aa6f7f2a2fb..6a530537ceeb6c7d4d5cbf6915c256bf7a3da2b5 100644
--- a/commentaries/managers.py
+++ b/commentaries/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/migrations/0003_auto_20190126_2058.py b/commentaries/migrations/0003_auto_20190126_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..60f7ec2db353c443229b2c83b1e82fe482402227
--- /dev/null
+++ b/commentaries/migrations/0003_auto_20190126_2058.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('commentaries', '0002_auto_20171229_1435'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='commentary',
+ name='subject_area',
+ field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], default='Phys:QP', max_length=10),
+ ),
+ ]
diff --git a/commentaries/models.py b/commentaries/models.py
index d568e1214ae191ad3d2f988eb42abceb2820074b..fd236e72176e725c056ca2d04caaea95a7322fe0 100644
--- a/commentaries/models.py
+++ b/commentaries/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/search_indexes.py b/commentaries/search_indexes.py
index e96d288c5a55e43d1369f087671a43a8c4b9b3f5..c695f0d07461adfd38f6e7de12400a5a446ca259 100644
--- a/commentaries/search_indexes.py
+++ b/commentaries/search_indexes.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/test_forms.py b/commentaries/test_forms.py
index eea11f8e0a1f149a05ee997c0f03b169603232e9..4bc8d3aed4edca2a464c57e11ef79185c90e60e4 100644
--- a/commentaries/test_forms.py
+++ b/commentaries/test_forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/test_models.py b/commentaries/test_models.py
index 658abf6521080efde97ff0f2746bad7028eed860..f56586f8b1e2b05362653d589be29ab95ef65589 100644
--- a/commentaries/test_models.py
+++ b/commentaries/test_models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/test_views.py b/commentaries/test_views.py
index 33804a96808b8a1af81d11d4c11836cfc56f0d3e..03b844e60b0df2c502da298a8e6bf653c66bd897 100644
--- a/commentaries/test_views.py
+++ b/commentaries/test_views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/urls.py b/commentaries/urls.py
index 62ac5fd92e351ab93c3ac6afaa05056198379f2c..4c5dd0e00efe0c2edb217210aa423f551c7c88c5 100644
--- a/commentaries/urls.py
+++ b/commentaries/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/commentaries/views.py b/commentaries/views.py
index bcb0b607dfc5c6d2b90fee65d878e94b653a8356..62db476923705ea30a6886bef3d1fb9476b60a82 100644
--- a/commentaries/views.py
+++ b/commentaries/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/admin.py b/comments/admin.py
index 5732dd9bf2bf12b75f7fff32d86f629c5b7634ce..80e566f7e87aaf147eeda93b5585b62bf8630a17 100644
--- a/comments/admin.py
+++ b/comments/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/behaviors.py b/comments/behaviors.py
index 64667ab99fa3dd4dcf650b2c99938fa2bd6ad656..e9401c4920a07dcc8c8b30b980676a2e911c89b4 100644
--- a/comments/behaviors.py
+++ b/comments/behaviors.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/constants.py b/comments/constants.py
index eb9075628daf3798a24569cf07aad32faf6ba4e3..68d882a244bbe7b9f4415428657365e84f2d087a 100644
--- a/comments/constants.py
+++ b/comments/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/factories.py b/comments/factories.py
index 48583c0a725ca34011687598710f709b70a87cfd..ceb51dcd761a2dc415e61708eac92f84657c5451 100644
--- a/comments/factories.py
+++ b/comments/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/forms.py b/comments/forms.py
index e9ec07e3e4ce6a08e627108737331bcc077647ea..6842ae1bca4c3f551d4d846fcba36f75f7d1fb3c 100644
--- a/comments/forms.py
+++ b/comments/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/managers.py b/comments/managers.py
index dc094232df4abcdc60b907f36d6fc894af72cf17..71b9f88843a5d935c84b72541dcc376ae3b4bbc1 100644
--- a/comments/managers.py
+++ b/comments/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/models.py b/comments/models.py
index be9a3678b2a50eabb989c354259d5e1a2eca6a56..357263d6b65d295be076ff69e1b2f1080ccaa71f 100644
--- a/comments/models.py
+++ b/comments/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/search_indexes.py b/comments/search_indexes.py
index 3f0ed301bf9a6d50f7134ad601018f7a0d5b9b37..69df86d8bc3818d53940c64664a9d8c2ac0dd467 100644
--- a/comments/search_indexes.py
+++ b/comments/search_indexes.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/templatetags/comment_extras.py b/comments/templatetags/comment_extras.py
index 690e881b2b4a1b2047af271874902f006a836357..76c5872b7aa9425de216eb2c95207c0301fad12e 100644
--- a/comments/templatetags/comment_extras.py
+++ b/comments/templatetags/comment_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/templatetags/file_extentions.py b/comments/templatetags/file_extentions.py
index 11a6ac2e768801a1c3a134b6a8db57d3395e59ce..e9ed277cf534539873c6954fe84e831357819ca1 100644
--- a/comments/templatetags/file_extentions.py
+++ b/comments/templatetags/file_extentions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/test_views.py b/comments/test_views.py
index 0b446f1cc16a4d78b9b5f233fb33034c97af6995..e385f0a48577e7a5bf0f330aaecde7d07137e57d 100644
--- a/comments/test_views.py
+++ b/comments/test_views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/tests.py b/comments/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/comments/tests.py
+++ b/comments/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/urls.py b/comments/urls.py
index 21099ad5e6a627d6922a5452b08eaeb0cf43bbf0..1f233ad02eb0b1f06a6a1e548e9add7403b36b0d 100644
--- a/comments/urls.py
+++ b/comments/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/utils.py b/comments/utils.py
index e245f7dd4c29597fabe7eaaaee40d4018d450d2e..9a4331608ffb3b4787a17392f33ab1ca0401b4fb 100644
--- a/comments/utils.py
+++ b/comments/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/comments/views.py b/comments/views.py
index b79ee9d9d3496a24ad1dd98bb0cefdcf3893e42d..2a908d6e4a377225eb4f9ca0874531e836727f42 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
import time
diff --git a/common/forms.py b/common/forms.py
index 5fa2d913773a61c40c068238d3a7be01ab3cce36..5ec561a7a8139cf9cc633834c463769b852f3f57 100644
--- a/common/forms.py
+++ b/common/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -106,14 +106,12 @@ class MonthYearWidget(Widget):
if not self.required:
index += 1
y = self.year_choices[index][0]
-
if y and m:
# Days are used for filtering, but not communicated to the user
if self.round_to_end:
d = calendar.monthrange(int(y), int(m))[1]
else:
- d = 1
-
+ d = '1'
return '%s-%s-%s' % (y, m, d)
return data.get(name, None)
diff --git a/common/helpers/__init__.py b/common/helpers/__init__.py
index 997f36d73f6d9e3badedecf8df6db2dfe2b7de73..a7119557d6d860c67618f4369597354891e01b0d 100644
--- a/common/helpers/__init__.py
+++ b/common/helpers/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/common/helpers/factories.py b/common/helpers/factories.py
index 124380e24aedbc676f47dc02756d2f300cf6dbde..ea2f277597d6770bf5ad38b9ced6ccf1229a5fb7 100644
--- a/common/helpers/factories.py
+++ b/common/helpers/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/common/helpers/test.py b/common/helpers/test.py
index 0cf11df60dd02884bd9ae00ff10837c5be982a22..2cf815d040c81c968f3ef11ec880554ed189ab6c 100644
--- a/common/helpers/test.py
+++ b/common/helpers/test.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/common/utils.py b/common/utils.py
index 0edde7a732a107ba3beb620cbd66ed9ff8b64c43..6f68fa0a3f4f010c9966cc56ca4559408eadc47a 100644
--- a/common/utils.py
+++ b/common/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/common/widgets.py b/common/widgets.py
index b3b3dfb3ab5a3a0ad3c52406f45fb1b47d26d3dc..3368270f871f0766011dc945faec52460e0b483c 100644
--- a/common/widgets.py
+++ b/common/widgets.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/admin.py b/conflicts/admin.py
index 79227b923d2319cc93c454cd1f0db8366fa0c505..61c5412a0f76d3706b6a1d438deef107419654fe 100644
--- a/conflicts/admin.py
+++ b/conflicts/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/apps.py b/conflicts/apps.py
index 749dd060425e635e5775c6c0e12c156c0d6c3eb0..b645a52bf8347d9a925fd91c46db191696cba541 100644
--- a/conflicts/apps.py
+++ b/conflicts/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/constants.py b/conflicts/constants.py
new file mode 100644
index 0000000000000000000000000000000000000000..dd9da9e9ef90c161ce32247170fb777aa9317dab
--- /dev/null
+++ b/conflicts/constants.py
@@ -0,0 +1,18 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+STATUS_UNVERIFIED, STATUS_VERIFIED = 'unverified', 'verified'
+STATUS_DEPRECATED = 'deprecated'
+CONFLICT_OF_INTEREST_STATUSES = (
+ (STATUS_UNVERIFIED, 'Unverified'),
+ (STATUS_VERIFIED, 'Verified by Admin'), # Confirmed // rejected
+ (STATUS_DEPRECATED, 'Deprecated'),
+)
+
+
+TYPE_OTHER, TYPE_COAUTHOR = 'other', 'coauthor'
+CONFLICT_OF_INTEREST_TYPES = (
+ (TYPE_COAUTHOR, 'Co-authorship'),
+ (TYPE_OTHER, 'Other'),
+)
diff --git a/conflicts/management/commands/update_coi_via_arxiv.py b/conflicts/management/commands/update_coi_via_arxiv.py
index 6fa3051cb964fb43ee57a9c606f4e221fc1d65ce..e3d7e78476b47fe55a0fe31e605045d98331b43b 100644
--- a/conflicts/management/commands/update_coi_via_arxiv.py
+++ b/conflicts/management/commands/update_coi_via_arxiv.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/managers.py b/conflicts/managers.py
index de2d794d4b0042dcf7b0a8b6fb185a45213c777a..c10aac82148553fd215c2fb8c4b07181cc0b816c 100644
--- a/conflicts/managers.py
+++ b/conflicts/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/models.py b/conflicts/models.py
index 5067a518c5fa96f1fdd1eb70ed49f6da893aabea..d2dbda3bd425636ea5c378283d400e46d06a6cad 100644
--- a/conflicts/models.py
+++ b/conflicts/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/serializers.py b/conflicts/serializers.py
index d56f8032fb045718964973f0871899e90fb8c381..040dedf3d3548e03b43461dfe74c5a72e629ea58 100644
--- a/conflicts/serializers.py
+++ b/conflicts/serializers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/services.py b/conflicts/services.py
index a629e55532f292f34c867abc9512555419dca98c..295b572146485a6754f5c310262bcf2cfbf2a6cb 100644
--- a/conflicts/services.py
+++ b/conflicts/services.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/templatetags/conflict_tags.py b/conflicts/templatetags/conflict_tags.py
index 6b18be4b0f2216bd6c25847d68e679c775fb8a41..fd050327c388c0d0b8550533f7b4af579a9469bd 100644
--- a/conflicts/templatetags/conflict_tags.py
+++ b/conflicts/templatetags/conflict_tags.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/tests.py b/conflicts/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/conflicts/tests.py
+++ b/conflicts/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/views.py b/conflicts/views.py
index 3dcbaf4f5d3078e6fae387d3a53101333eae998e..bd26fc01aafe36ec48ad99d6a3f0622c06ba18fe 100644
--- a/conflicts/views.py
+++ b/conflicts/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/conflicts/viewsets.py b/conflicts/viewsets.py
index 5717b83c595fbe569c90b1118204d3147bf39841..9615e98ac3430f7aa34251faa9b3d7949ad4e11a 100644
--- a/conflicts/viewsets.py
+++ b/conflicts/viewsets.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5c7590eae9c71c65a8fa79c83b66acd6a8860f69..26c7fab61d7a8dcf195c6dd3c0e25c571254c8af 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
# -*- coding: utf-8 -*-
#
# Configuration file for the Sphinx documentation builder.
diff --git a/finances/admin.py b/finances/admin.py
index c887dee025b18e2249c89740f90d08ad10be7f57..9cd10b6fb2e30f396022a1650c5e51610059db4e 100644
--- a/finances/admin.py
+++ b/finances/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/finances/apps.py b/finances/apps.py
index 7f45c1d72f49a6d86062c10c06e732eabaebc561..2979a85885d82ee59918768ba722771023cdda7b 100644
--- a/finances/apps.py
+++ b/finances/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/finances/constants.py b/finances/constants.py
index 455a109319be2f1d461b83cb0a407e0eb963e7bf..b700a6f0432f14d9a2b65203fdd145b9e4fff95e 100644
--- a/finances/constants.py
+++ b/finances/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/finances/forms.py b/finances/forms.py
index 7786bd89458bedb323c6ea652bec3695e2807994..4320a7d73800a1d5455a83bbf689a23b5c77cf5d 100644
--- a/finances/forms.py
+++ b/finances/forms.py
@@ -1,6 +1,7 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+import datetime
from django import forms
from django.contrib.auth import get_user_model
@@ -9,10 +10,12 @@ from django.db.models import Sum
from django.utils import timezone
from ajax_select.fields import AutoCompleteSelectField
+from dateutil.rrule import rrule, MONTHLY
-from .models import Subsidy, WorkLog
+from common.forms import MonthYearWidget
+from scipost.fields import UserModelChoiceField
-today = timezone.now().date()
+from .models import Subsidy, WorkLog
class SubsidyForm(forms.ModelForm):
@@ -45,40 +48,83 @@ class WorkLogForm(forms.ModelForm):
}
-class LogsMonthlyActiveFilter(forms.Form):
- month = forms.ChoiceField(choices=[(k, v) for k, v in MONTHS.items()])
- year = forms.ChoiceField(choices=[(y, y) for y in reversed(range(today.year-6, today.year+1))])
+class LogsFilter(forms.Form):
+ """
+ Filter work logs given the requested date range and users.
+ """
+
+ employee = UserModelChoiceField(
+ queryset=get_user_model().objects.filter(work_logs__isnull=False).distinct(),
+ required=False, empty_label='Show all')
+ start = forms.DateField(widget=MonthYearWidget(required=True), required=True) # Month
+ end = forms.DateField(widget=MonthYearWidget(required=True, end=True), required=True) # Month
def __init__(self, *args, **kwargs):
- if not kwargs.get('data', False) and not args[0]:
- args = list(args)
- args[0] = {
- 'month': today.month,
- 'year': today.year
- }
- args = tuple(args)
- kwargs['initial'] = {
- 'month': today.month,
- 'year': today.year
- }
super().__init__(*args, **kwargs)
-
- def get_totals(self):
- # Make accessible without need to explicitly check validity of form.
- self.is_valid()
-
- users = get_user_model().objects.filter(
- work_logs__work_date__month=self.cleaned_data['month'],
- work_logs__work_date__year=self.cleaned_data['year']).distinct()
+ today = timezone.now().date()
+ self.initial['start'] = today.today()
+ self.initial['end'] = today.today()
+
+ def clean(self):
+ if self.is_valid():
+ self.cleaned_data['months'] = [
+ dt for dt in rrule(
+ MONTHLY,
+ dtstart=self.cleaned_data['start'],
+ until=self.cleaned_data['end'])]
+ return self.cleaned_data
+
+ def get_months(self):
+ if self.is_valid():
+ return self.cleaned_data.get('months', [])
+ return []
+
+ def filter(self):
+ """Filter work logs and return in user-grouped format."""
output = []
- for user in users:
- logs = user.work_logs.filter(
- work_date__month=self.cleaned_data['month'],
- work_date__year=self.cleaned_data['year'])
- output.append({
- 'logs': logs,
- 'duration': logs.aggregate(total=Sum('duration')),
- 'user': user
- })
+ if self.is_valid():
+ if self.cleaned_data['employee']:
+ user_qs = get_user_model().objects.filter(id=self.cleaned_data['employee'].id)
+ else:
+ user_qs = get_user_model().objects.filter(work_logs__isnull=False)
+ user_qs = user_qs.filter(
+ work_logs__work_date__gte=self.cleaned_data['start'],
+ work_logs__work_date__lte=self.cleaned_data['end']).distinct()
+
+ output = []
+ for user in user_qs:
+ logs = user.work_logs.filter(
+ work_date__gte=self.cleaned_data['start'],
+ work_date__lte=self.cleaned_data['end']).distinct()
+
+ output.append({
+ 'logs': logs,
+ 'duration': logs.aggregate(total=Sum('duration')),
+ 'user': user,
+ })
+ return output
+ def filter_per_month(self):
+ """Filter work logs and return in per-month format."""
+ output = []
+ if self.is_valid():
+ if self.cleaned_data['employee']:
+ user_qs = get_user_model().objects.filter(id=self.cleaned_data['employee'].id)
+ else:
+ user_qs = get_user_model().objects.filter(work_logs__isnull=False)
+ user_qs = user_qs.filter(
+ work_logs__work_date__gte=self.cleaned_data['start'],
+ work_logs__work_date__lte=self.cleaned_data['end']).distinct()
+
+ output = []
+ for user in user_qs:
+ # If logs exists for given filters
+ output.append({
+ 'logs': [],
+ 'user': user,
+ })
+ for dt in self.get_months():
+ output[-1]['logs'].append(
+ user.work_logs.filter(
+ work_date__year=dt.year, work_date__month=dt.month).aggregate(total=Sum('duration'))['total'])
return output
diff --git a/finances/models.py b/finances/models.py
index c6cd606061aaea986ef4d3f6a1289b954e0f92d8..7cc8f07076ea1b0b4e15875a0421e7810ae5b841 100644
--- a/finances/models.py
+++ b/finances/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/finances/templates/finances/base.html b/finances/templates/finances/base.html
index f906eaeba8f731537620149d6f341da3a17c11ee..3847767ad1267cfbb539d30226a031c209be785a 100644
--- a/finances/templates/finances/base.html
+++ b/finances/templates/finances/base.html
@@ -3,7 +3,7 @@
{% block body_class %}{{ block.super }} finances{% endblock %}
{% block breadcrumb %}
- <div class="container-outside header">
+ <div class="breadcrumb-container">
<div class="container">
<nav class="breadcrumb hidden-sm-down">
{% block breadcrumb_items %}
diff --git a/finances/templates/finances/subsidy_list.html b/finances/templates/finances/subsidy_list.html
index e8a11c93262fd3a946ca40c8c83ce4130167df90..5499061ad81e2956fdb9cf82314f67fdea3a25f8 100644
--- a/finances/templates/finances/subsidy_list.html
+++ b/finances/templates/finances/subsidy_list.html
@@ -4,7 +4,6 @@
{% load staticfiles %}
-
{% block headsup %}
<script type="text/javascript">
$(document).ready(function($) {
@@ -17,16 +16,16 @@ $(document).ready(function($) {
{% block breadcrumb_items %}
-{{ block.super }}
-<span class="breadcrumb-item">Subsidies</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Subsidies</span>
{% endblock %}
{% block content %}
<div class="row">
<div class="col-12">
- <h3 class="highlight">Subsidies</h3>
- {% if perms.scipost.can_manage_subsidies %}
+ <h1 class="highlight">Subsidies</h1>
+ {% if perms.scipost.can_manage_subsidies %}
<ul>
<li><a href="{% url 'finances:subsidy_create' %}">Add a Subsidy</a></li>
</ul>
diff --git a/finances/templates/finances/timesheets.html b/finances/templates/finances/timesheets.html
index f32ae41dfa46ac45e19d96ffca47e1e1e01e030f..e48fdf69a8d94a2c0b3093275de6f3b3d3663dca 100644
--- a/finances/templates/finances/timesheets.html
+++ b/finances/templates/finances/timesheets.html
@@ -1,10 +1,11 @@
-{% extends 'scipost/base.html' %}
+{% extends 'finances/base.html' %}
{% block breadcrumb_items %}
- <span class="breadcrumb-item">Team Timesheets</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">Team timesheets</span>
{% endblock %}
-{% block pagetitle %}: Team Timesheets{% endblock pagetitle %}
+{% block pagetitle %}: Team timesheets{% endblock pagetitle %}
{% load bootstrap %}
{% load scipost_extras %}
@@ -13,10 +14,25 @@
<div class="row">
<div class="col-12">
- <h1 class="highlight">Team Timesheets</h1>
+ <h1 class="highlight">Timesheets</h1>
+ <a href="{% url 'finances:timesheets_detailed' %}">See detailed timesheets</a>
+ <br>
+ <br>
+
+ <form method="get">
+ {{form.employee|bootstrap }}
+
+ <label>Date from</label>
+ <div class="form-row">
+ {{ form.start }}
+ </div>
+
+ <label>Date until</label>
+ <div class="form-row">
+ {{ form.end }}
+ </div>
+ <br>
- <form method="get" action="{% url 'finances:timesheets' %}">
- {{ form|bootstrap }}
<input type="submit" class="btn btn-primary" value="Filter">
</form>
</div>
@@ -24,38 +40,34 @@
<div class="row">
<div class="col-12">
- <h2 class="mb-2 mt-4">Team Timesheets</h2>
- {% for total in totals %}
- <h3 class="mb-1">{{ total.user.first_name }} {{ total.user.last_name }}</h3>
- <table class="table">
+ {% if form.is_bound and form.is_valid %}
+ <h2 class="mb-2 mt-4">Team timesheets</h2>
+ <h4 class="mb-1">{{ user_log.user.first_name }} {{ user_log.user.last_name }}</h4>
+ <table class="table table-hover">
<thead class="thead-default">
<tr>
- <th>Date</th>
- <th>Related to object</th>
- <th>Log type</th>
- <th>Comments</th>
- <th>Duration</th>
+ <th>Employee</th>
+ {% for month in form.get_months %}
+ <th>{{ month|date:'N Y' }}</th>
+ {% endfor %}
</tr>
</thead>
<tbody>
- {% for log in total.logs %}
+ {% for user_log in form.filter_per_month %}
<tr>
- <td>{{ log.work_date }}</td>
- <td>{{ log.content }}</td>
- <td>{{ log.log_type }}</td>
- <td>{{ log.comments }}</td>
- <td>{{ log.duration|duration }}</td>
+ <td>{{ user_log.user.last_name }}, {{ user_log.user.first_name }}</td>
+ {% for log in user_log.logs %}
+ <td>{{ log|duration }}</td>
+ {% endfor %}
</tr>
+ {% empty %}
+ <tr><td colspan="5">No logs found.</td></tr>
{% endfor %}
- <tr>
- <td colspan="4"></td>
- <td><strong>{{ total.duration.total }}</strong></td>
- </tr>
</tbody>
</table>
- {% empty %}
- <h3>Timesheet is empty for this month.</h3>
- {% endfor %}
+ {% else %}
+ <p class="text-danger">First submit the filter form to retrieve results.</p>
+ {% endif %}
</div>
</div>
{% endblock %}
diff --git a/finances/templates/finances/timesheets_detailed.html b/finances/templates/finances/timesheets_detailed.html
new file mode 100644
index 0000000000000000000000000000000000000000..eaa0530386e633b0958af933be45b135b4f24214
--- /dev/null
+++ b/finances/templates/finances/timesheets_detailed.html
@@ -0,0 +1,80 @@
+{% extends 'finances/base.html' %}
+
+{% block breadcrumb_items %}
+ {{ block.super }}
+ <a href="{% url 'finances:timesheets' %}" class="breadcrumb-item">Team timesheets</a>
+ <span class="breadcrumb-item">Detailed timesheets</span>
+{% endblock %}
+
+{% block pagetitle %}: Team timesheets{% endblock pagetitle %}
+
+{% load bootstrap %}
+{% load scipost_extras %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Detailed timesheets</h1>
+ <br>
+
+ <form method="get">
+ {{form.employee|bootstrap }}
+
+ <label>Date from</label>
+ <div class="form-row">
+ {{ form.start }}
+ </div>
+
+ <label>Date until</label>
+ <div class="form-row">
+ {{ form.end }}
+ </div>
+ <br>
+
+ <input type="submit" class="btn btn-primary" value="Filter">
+ </form>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ {% if form.is_bound and form.is_valid %}
+ <h2 class="mb-2 mt-4">Team timesheets</h2>
+ {% for user_log in form.filter %}
+ <h4 class="mb-1">{{ user_log.user.first_name }} {{ user_log.user.last_name }}</h4>
+ <table class="table table-hover">
+ <thead class="thead-default">
+ <tr>
+ <th>Date</th>
+ <th>Related to object</th>
+ <th>Log type</th>
+ <th>Comments</th>
+ <th>Duration</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for log in user_log.logs %}
+ <tr>
+ <td>{{ log.work_date }}</td>
+ <td>{{ log.content }}</td>
+ <td>{{ log.log_type }}</td>
+ <td>{{ log.comments }}</td>
+ <td>{{ log.duration|duration }}</td>
+ </tr>
+ {% endfor %}
+ <tr>
+ <td colspan="4" class="text-right">Total:</td>
+ <td><strong>{{ user_log.duration.total|duration }}</strong></td>
+ </tr>
+ </tbody>
+ </table>
+ {% empty %}
+ <p>No logs found.</p>
+ {% endfor %}
+ {% else %}
+ <p class="text-danger">First submit the filter form to retrieve results.</p>
+ {% endif %}
+ </div>
+</div>
+{% endblock %}
diff --git a/finances/tests.py b/finances/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/finances/tests.py
+++ b/finances/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/finances/urls.py b/finances/urls.py
index b7027f8c2ba86bdc363bfae3562425c4539a6468..31bd7da08fed250e82b94718d8467d4b6fc4dabc 100644
--- a/finances/urls.py
+++ b/finances/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -8,48 +8,19 @@ from django.views.generic import TemplateView
from . import views
urlpatterns = [
- url(
- r'^$',
- TemplateView.as_view(template_name='finances/finances.html'),
- name='finances'
- ),
+ url(r'^$', TemplateView.as_view(template_name='finances/finances.html'), name='finances'),
# Subsidies
- url(
- r'^subsidies/$',
- views.SubsidyListView.as_view(),
- name='subsidies'
- ),
- url(
- r'^subsidies/add/$',
- views.SubsidyCreateView.as_view(),
- name='subsidy_create'
- ),
- url(
- r'^subsidies/(?P<pk>[0-9]+)/update/$',
- views.SubsidyUpdateView.as_view(),
- name='subsidy_update'
- ),
- url(
- r'^subsidies/(?P<pk>[0-9]+)/delete/$',
- views.SubsidyDeleteView.as_view(),
- name='subsidy_delete'
- ),
- url(
- r'^subsidies/(?P<pk>[0-9]+)/$',
- views.SubsidyDetailView.as_view(),
- name='subsidy_details'
- ),
+ url(r'^subsidies/$', views.SubsidyListView.as_view(), name='subsidies'),
+ url(r'^subsidies/add/$', views.SubsidyCreateView.as_view(), name='subsidy_create'),
+ url(r'^subsidies/(?P<pk>[0-9]+)/update/$', views.SubsidyUpdateView.as_view(),
+ name='subsidy_update'),
+ url(r'^subsidies/(?P<pk>[0-9]+)/delete/$', views.SubsidyDeleteView.as_view(),
+ name='subsidy_delete'),
+ url(r'^subsidies/(?P<pk>[0-9]+)/$', views.SubsidyDetailView.as_view(), name='subsidy_details'),
# Timesheets
- url(
- r'^timesheets$',
- views.timesheets,
- name='timesheets'
- ),
- url(
- r'^logs/(?P<slug>\d+)/delete$',
- views.LogDeleteView.as_view(),
- name='log_delete'
- ),
+ url(r'^timesheets$', views.timesheets, name='timesheets'),
+ url(r'^timesheets/detailed$', views.timesheets_detailed, name='timesheets_detailed'),
+ url(r'^logs/(?P<slug>\d+)/delete$', views.LogDeleteView.as_view(), name='log_delete'),
]
diff --git a/finances/utils.py b/finances/utils.py
index b44359cb9f3992823efcbd015a19acd385add759..74a4da7d7b96bc0c63248460f9e4cfc4f8481d80 100644
--- a/finances/utils.py
+++ b/finances/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/finances/views.py b/finances/views.py
index 6b43fd16b8e712e3d4cf69dc46138ebcd84c447f..90f6c21037c653f2b74f6b61327f860de5d5a297 100644
--- a/finances/views.py
+++ b/finances/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -12,7 +12,7 @@ from django.views.generic.detail import DetailView
from django.views.generic.edit import CreateView, UpdateView, DeleteView
from django.views.generic.list import ListView
-from .forms import SubsidyForm, LogsMonthlyActiveFilter
+from .forms import SubsidyForm, LogsFilter
from .models import Subsidy, WorkLog
from .utils import slug_to_id
@@ -85,17 +85,19 @@ class SubsidyDetailView(DetailView):
@permission_required('scipost.can_view_timesheets', raise_exception=True)
def timesheets(request):
"""
- See an overview per month of all timesheets.
+ Overview of all timesheets including comments and related objects.
"""
- form = LogsMonthlyActiveFilter(request.GET or None)
- context = {
- 'form': form,
- }
+ form = LogsFilter(request.GET or None)
+ context = {'form': form}
+ return render(request, 'finances/timesheets.html', context)
- # if form.is_valid():
- context['totals'] = form.get_totals()
- return render(request, 'finances/timesheets.html', context)
+@permission_required('scipost.can_view_timesheets', raise_exception=True)
+def timesheets_detailed(request):
+ """Overview of all timesheets. """
+ form = LogsFilter(request.GET or None)
+ context = {'form': form}
+ return render(request, 'finances/timesheets_detailed.html', context)
class LogDeleteView(LoginRequiredMixin, DeleteView):
diff --git a/funders/admin.py b/funders/admin.py
index bdcadfdad35b2734063fefe7eff536afb213e68c..7914c2dba1a6f82ee2811c7b6ae4088e14d4b17a 100644
--- a/funders/admin.py
+++ b/funders/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/funders/apps.py b/funders/apps.py
index 97a8fa2d2e0867bd5067419e2e80a346ab6e92db..39424429fd989a501c06acb38fa2c80f81f523ef 100644
--- a/funders/apps.py
+++ b/funders/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/funders/forms.py b/funders/forms.py
index bd602d7d776a3280f542f314b37abe512ae3397d..728cacd8762def5fe6cfb2f5a2783910bdf9037a 100644
--- a/funders/forms.py
+++ b/funders/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/funders/managers.py b/funders/managers.py
index 12d206fbfbd2615bfca021d1b008fe64ed7197b0..92087cd13d69b02bc1964d66fa4e06d891ad857d 100644
--- a/funders/managers.py
+++ b/funders/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/funders/models.py b/funders/models.py
index e88ea8427b35c59d568cb9cbcabc7878bcbb6039..35a9113e5b31e62a8dcc217c5ccff6f22358fbdb 100644
--- a/funders/models.py
+++ b/funders/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/funders/tests.py b/funders/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/funders/tests.py
+++ b/funders/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/funders/urls.py b/funders/urls.py
index df982d8cdb7491bb5c873a2a776525d2252edef0..d3471f3d187664638c3c13d14ffe81b6587f4fb0 100644
--- a/funders/urls.py
+++ b/funders/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/funders/views.py b/funders/views.py
index 13de713958a442ff9709e4ef0ecd6dd2dea4f115..a82f68980724c6cc466c70362d7c7f5d7ae03cbe 100644
--- a/funders/views.py
+++ b/funders/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/guides/admin.py b/guides/admin.py
index 8c38f3f3dad51e4585f3984282c2a4bec5349c1e..05b4ce08c7d593d4ed7b4418017c0d8736e57c12 100644
--- a/guides/admin.py
+++ b/guides/admin.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.contrib import admin
# Register your models here.
diff --git a/guides/apps.py b/guides/apps.py
index 520c221772cf6b5ce18da8fdfd68968d0d953293..1af278a4c924ec0e3a5f3f075dd28dad2524ee3c 100644
--- a/guides/apps.py
+++ b/guides/apps.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.apps import AppConfig
diff --git a/guides/models.py b/guides/models.py
index 71a836239075aa6e6e4ecb700e9c42c95c022d91..6df45157bd0d9c823ccdc8b4cb48772206952be4 100644
--- a/guides/models.py
+++ b/guides/models.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.db import models
# Create your models here.
diff --git a/guides/tests.py b/guides/tests.py
index 7ce503c2dd97ba78597f6ff6e4393132753573f6..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/guides/tests.py
+++ b/guides/tests.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.test import TestCase
# Create your tests here.
diff --git a/guides/urls.py b/guides/urls.py
index 6a6513d0fa0849bb01525ac1bc7a853612ed9683..5e7c323057d515f3835779b04b745b5bc0f90f51 100644
--- a/guides/urls.py
+++ b/guides/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/guides/views.py b/guides/views.py
index 91ea44a218fbd2f408430959283f0419c921093e..bd26fc01aafe36ec48ad99d6a3f0622c06ba18fe 100644
--- a/guides/views.py
+++ b/guides/views.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.shortcuts import render
# Create your views here.
diff --git a/invitations/admin.py b/invitations/admin.py
index 068ed5f3598d9def5645964aa8ae308ec7d23f64..ea1a25bb4a36fdd5ba38f1c9ea58a239f7ac0391 100644
--- a/invitations/admin.py
+++ b/invitations/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/apps.py b/invitations/apps.py
index 84c57f234cb62b2ce9d2260e49f125eeb3883652..a5a0c4a425b9ef284e26786855d1d43a4f0c57fa 100644
--- a/invitations/apps.py
+++ b/invitations/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/constants.py b/invitations/constants.py
index 6ab60c59d3e33d05723f2bc4778d9392ab736f7e..3c91700e817303401c98a57705dd87abce283d91 100644
--- a/invitations/constants.py
+++ b/invitations/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/forms.py b/invitations/forms.py
index 32f1783181d62c3da0146d9fc7141e48d90b1217..13de0ac4abe2dbb386c2350bb6f21376bd3c84da 100644
--- a/invitations/forms.py
+++ b/invitations/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/managers.py b/invitations/managers.py
index 7be8397bf179cf09ce15c1a8813b8b462b54b6c3..f2debd1996e51d8481777e16954751312cf650f9 100644
--- a/invitations/managers.py
+++ b/invitations/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/mixins.py b/invitations/mixins.py
index 2fda1789eee9074f3617ec60d2268cab271b2da6..42b9743081c23ed9572b433645d22aa09787a200 100644
--- a/invitations/mixins.py
+++ b/invitations/mixins.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/models.py b/invitations/models.py
index 93415d1bc8f7b8fc6d079c0d06957b6d4d8176e6..796bdcbfa4dd98c1d823effa6e9bc7eb651071b3 100644
--- a/invitations/models.py
+++ b/invitations/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/tests.py b/invitations/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/invitations/tests.py
+++ b/invitations/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/urls.py b/invitations/urls.py
index 21317aaf5b7d845e4696bd0d0622ad7baab62d2d..33d23abb3b3a8396d9fe1f8da25ac155b25fd285 100644
--- a/invitations/urls.py
+++ b/invitations/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/utils.py b/invitations/utils.py
index e1012ff97a8aa2ed0ff29aa7323bbe7d42abbcb4..6abd61a33e55d7535ceef19f8b8730ff08469abf 100644
--- a/invitations/utils.py
+++ b/invitations/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/invitations/views.py b/invitations/views.py
index 8181068f21a253a73947fc93c752f837ab1a1c93..efcd198b220afbdb4bd9b1a1180e5823af2430aa 100644
--- a/invitations/views.py
+++ b/invitations/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/admin.py b/journals/admin.py
index 12529845b5a1c6f671adb3f7b55acd169c9d2a79..70325aa53a67335fecd782c2aea15fa6a4aff8f9 100644
--- a/journals/admin.py
+++ b/journals/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/behaviors.py b/journals/behaviors.py
index ce61585abd8761eea51ea03f31e3d9393cdf3910..7ef4553acea7a9c4e558ac780839b59e19c52113 100644
--- a/journals/behaviors.py
+++ b/journals/behaviors.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/constants.py b/journals/constants.py
index baa72d74c0af570ef7ae1a7637a92b45f1015877..562853d5e51f705308f64488b0d8a8cdd35acea1 100644
--- a/journals/constants.py
+++ b/journals/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/exceptions.py b/journals/exceptions.py
index d7d1b2642e5818ea410c6deeeba4f25e90e76955..f3ee072bb30a544bce998d7577a030b68458ac50 100644
--- a/journals/exceptions.py
+++ b/journals/exceptions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/factories.py b/journals/factories.py
index 5f74ef19e736a38089e47086058f4e9bfafbab81..232091d8a54056eefa191aad4dbd3e798bda747c 100644
--- a/journals/factories.py
+++ b/journals/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/forms.py b/journals/forms.py
index 3a7d92663422da50318673838c8657b0e775ab4d..86e941d73809fdc8a6cb826f8c2f95001a6ee672 100644
--- a/journals/forms.py
+++ b/journals/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/helpers.py b/journals/helpers.py
index 36b2819df320c0360d6480efd84b0bf129705461..7cba8ae4544749e7906b372e15f6c4a1d89dfb3d 100644
--- a/journals/helpers.py
+++ b/journals/helpers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/management/commands/create_issues.py b/journals/management/commands/create_issues.py
index e2165c1dbf0785222b196c0ed8bdda571e4990bd..3158ef5b213d7fd946b98abae349a61271afcba5 100644
--- a/journals/management/commands/create_issues.py
+++ b/journals/management/commands/create_issues.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/management/commands/create_journals.py b/journals/management/commands/create_journals.py
index 8d0c34182ea410638173f0bfc3da1a0f32162132..e21845cfaae9765832c74583a5096f267c86d017 100644
--- a/journals/management/commands/create_journals.py
+++ b/journals/management/commands/create_journals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/management/commands/create_publications.py b/journals/management/commands/create_publications.py
index 0da7e41c135db2cdbd257d73fe01ecc3f446573c..8f6a22c631392417f244721afc8ca1ba0e52f158 100644
--- a/journals/management/commands/create_publications.py
+++ b/journals/management/commands/create_publications.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/management/commands/create_volumes.py b/journals/management/commands/create_volumes.py
index 3bd1217d57d51342a82f91db5249730fedd6caf9..843de1bbe1d6c4a9c9e4ca501b8069bb1e0432fb 100644
--- a/journals/management/commands/create_volumes.py
+++ b/journals/management/commands/create_volumes.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/managers.py b/journals/managers.py
index f4ead6cac827c5a23cf13705fe8bc674b1dd5c2c..82ef6d3a89929fd9155f82f1044bcb610bf74952 100644
--- a/journals/managers.py
+++ b/journals/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/migrations/0054_auto_20190110_1204.py b/journals/migrations/0054_auto_20190110_1204.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c08d3941b956f079d095abcb7252e39f9bb889b
--- /dev/null
+++ b/journals/migrations/0054_auto_20190110_1204.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-10 11:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0053_auto_20181118_1758'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='issue',
+ name='in_journal',
+ field=models.ForeignKey(blank=True, help_text='Assign either a Volume or Journal to the Issue', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='issues', to='journals.Journal'),
+ ),
+ migrations.AlterField(
+ model_name='issue',
+ name='in_volume',
+ field=models.ForeignKey(blank=True, help_text='Assign either a Volume or Journal to the Issue', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='issues', to='journals.Volume'),
+ ),
+ ]
diff --git a/journals/migrations/0055_auto_20190126_2058.py b/journals/migrations/0055_auto_20190126_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..2e95500c73fc38f808803f0fc0f7cd72f345c8ad
--- /dev/null
+++ b/journals/migrations/0055_auto_20190126_2058.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import scipost.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0054_auto_20190110_1204'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='publication',
+ name='secondary_areas',
+ field=scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], max_length=10), blank=True, null=True, size=None),
+ ),
+ migrations.AlterField(
+ model_name='publication',
+ name='subject_area',
+ field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], default='Phys:QP', max_length=10, verbose_name='Primary subject area'),
+ ),
+ ]
diff --git a/journals/mixins.py b/journals/mixins.py
index e4ab4013cbd1a75c4bec589a34bcc1c9c2cc04e3..3be3e5ae80ccf8464dd35cd4e1e245625db79cae 100644
--- a/journals/mixins.py
+++ b/journals/mixins.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/models.py b/journals/models.py
index ee1c7a4d2caec59d040aa6fe1cc724acdaa119f1..19f91696369b9c352752288f5461df2e77da734c 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -198,8 +198,10 @@ class Journal(models.Model):
return ncites/nrpub
class Volume(models.Model):
- """A Volume may be used as a subgroup of Publications related to a specific Issue object."""
-
+ """
+ A Volume belongs to a specific Journal, and is a container for
+ either (multiple) Issue(s) or Publication(s).
+ """
in_journal = models.ForeignKey('journals.Journal', on_delete=models.CASCADE)
number = models.PositiveSmallIntegerField()
start_date = models.DateField(default=timezone.now)
@@ -258,14 +260,16 @@ class Volume(models.Model):
class Issue(models.Model):
- """An Issue may be used as a subgroup of Publications related to a specific Journal object."""
-
+ """
+ An Issue is related to a specific Journal, either indirectly via a Volume
+ container, or directly. It is a container for multiple Publications.
+ """
in_journal = models.ForeignKey(
'journals.Journal', on_delete=models.CASCADE, null=True, blank=True,
- help_text='Assign either an Volume or Journal to the Issue')
+ help_text='Assign either a Volume or Journal to the Issue')
in_volume = models.ForeignKey(
'journals.Volume', on_delete=models.CASCADE, null=True, blank=True,
- help_text='Assign either an Volume or Journal to the Issue')
+ help_text='Assign either a Volume or Journal to the Issue')
number = models.PositiveSmallIntegerField()
slug = models.SlugField()
start_date = models.DateField(default=timezone.now)
diff --git a/journals/search_indexes.py b/journals/search_indexes.py
index c01f22dd19db770537be76b8d0d870ae3e686dd9..5dbdf4ec793a99ddc72b95e2298209c550adb005 100644
--- a/journals/search_indexes.py
+++ b/journals/search_indexes.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/serializers.py b/journals/serializers.py
index 9de735e384bc500766c0d79f22c466c3071d73c4..0a76d504862558e6ff41bfcef7ae2d5100e5dbe3 100644
--- a/journals/serializers.py
+++ b/journals/serializers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/signals.py b/journals/signals.py
index 17f15821add3415f967d34c366473031d54176ec..a64f4ff3db0220e2868031be5931d308e3f6b8e1 100644
--- a/journals/signals.py
+++ b/journals/signals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/templatetags/journals_extras.py b/journals/templatetags/journals_extras.py
index e563322307212849ea971200baa210e618bbd92c..ce3392897cb2cca8b68a1aaafdf2ecd144944221 100644
--- a/journals/templatetags/journals_extras.py
+++ b/journals/templatetags/journals_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/templatetags/lookup.py b/journals/templatetags/lookup.py
index 6be75f8510203a570cf2b6430166ac8f6bdd15d5..0cdcd41b33540a993e5f23bbdedf3931f4ae882b 100644
--- a/journals/templatetags/lookup.py
+++ b/journals/templatetags/lookup.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/templatetags/publication_administration.py b/journals/templatetags/publication_administration.py
index 6a047dbeb4881198fd3e1c4ab786784995f2596a..7e5a474898f57cf606c89b14b79c6d73fa090594 100644
--- a/journals/templatetags/publication_administration.py
+++ b/journals/templatetags/publication_administration.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/tests.py b/journals/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/journals/tests.py
+++ b/journals/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/urls/general.py b/journals/urls/general.py
index 65ce483561024601291220e74fdbd537507739fb..87b194828631fee4b013c9d7ea506e169727254f 100644
--- a/journals/urls/general.py
+++ b/journals/urls/general.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/urls/journal.py b/journals/urls/journal.py
index 98c884d6ae8af2efe84967af60f4b9fd54fc0865..928da4314f0e9e78c7a5b12e9cdee8fdc859eb98 100644
--- a/journals/urls/journal.py
+++ b/journals/urls/journal.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/utils.py b/journals/utils.py
index 9f0d0288e4f64a47d505084aa097d82138aea799..5289e1a95ba9d817df223a3fccd1fa2e688e30d1 100644
--- a/journals/utils.py
+++ b/journals/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/journals/views.py b/journals/views.py
index caeb73efdef08d019f1a8b88ac5387d077c4fbc4..6fd2c8254b7a587e8250fef34691824e80b746e4 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -155,7 +155,7 @@ def landing_page(request, doi_label):
"""Journal details page.
The landing page of a Journal lists either the latest and the current issue of a Journal
- of paginates the individual Publications.
+ or paginates its individual Publications.
"""
journal = get_object_or_404(Journal, doi_label=doi_label)
context = {
diff --git a/journals/viewsets.py b/journals/viewsets.py
index c2a283f17b43b03797897b0a25e9bb02d8b38d8a..e5d7317c96323d7d3ef34027e529fe6e36958718 100644
--- a/journals/viewsets.py
+++ b/journals/viewsets.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/admin.py b/mailing_lists/admin.py
index e0ae1f5b33533e6115e4e03dcb9b4d1423132400..c7a74706a432fdf8d3e15556502df80ec16d0f6e 100644
--- a/mailing_lists/admin.py
+++ b/mailing_lists/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/apps.py b/mailing_lists/apps.py
index 2b9f85b5ec37d825a937b28284298c8680f63588..e16358af556f62322122fe3855ca26a277d8582b 100644
--- a/mailing_lists/apps.py
+++ b/mailing_lists/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/constants.py b/mailing_lists/constants.py
index 285a6594484c3725bfee0884ed970b3301ab6f36..bcc84a5e6a61963172b156a569c25f18a493ecd6 100644
--- a/mailing_lists/constants.py
+++ b/mailing_lists/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/forms.py b/mailing_lists/forms.py
index e5880d9aa2e90a34ad8e6a699465934fb394ad2e..e5911563bb905f79b9cdf218ba2afeb14f1a093d 100644
--- a/mailing_lists/forms.py
+++ b/mailing_lists/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/managers.py b/mailing_lists/managers.py
index 1a16081d0ee437cc1a1f400eba6bf6910ddff455..cbcac55b3fd81282bcc4e5d20a43ec7081ea094b 100644
--- a/mailing_lists/managers.py
+++ b/mailing_lists/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/models.py b/mailing_lists/models.py
index e9ccc0b32da6c800d3179cda24d3a3adb32cc709..304e78adfcd152e924ebb5bcce95e4a91783b366 100644
--- a/mailing_lists/models.py
+++ b/mailing_lists/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/tests.py b/mailing_lists/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/mailing_lists/tests.py
+++ b/mailing_lists/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/urls.py b/mailing_lists/urls.py
index cf553972f7b72720086df47889d67a77ffa8f3b3..1dc2e10ebdb66c709dfbaec042d136ce3fd50b5e 100644
--- a/mailing_lists/urls.py
+++ b/mailing_lists/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mailing_lists/views.py b/mailing_lists/views.py
index faa490050e9855993987f503c660d06cf138d6eb..23272885476f9f8e3dadd64d86f67e6dc0e2863e 100644
--- a/mailing_lists/views.py
+++ b/mailing_lists/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/admin.py b/mails/admin.py
index 7fa9f68ca1ae63a3c6fe1de6fba0c9b1be615140..c351e617f114fc2b5be48d03a4d0d5cb6540a5d9 100644
--- a/mails/admin.py
+++ b/mails/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/apps.py b/mails/apps.py
index d393c4dcc3e6f4053cce51159df094e50cf4b1ce..f7dbfd8193c2576823de5c868829800c2c5421ff 100644
--- a/mails/apps.py
+++ b/mails/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/backends/base.py b/mails/backends/base.py
index 3a7833a83f3358d1d5c09c9ff6f80e5f5c7a5c95..10f61d384a510d73c7d370ba1d50d57f839f0bd8 100644
--- a/mails/backends/base.py
+++ b/mails/backends/base.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/backends/filebased.py b/mails/backends/filebased.py
index 71688950a3c5ad2eefc6748415643ce13c39c5b7..3e1fad5a718eda2b05a22d9487656bcdcea4b181 100644
--- a/mails/backends/filebased.py
+++ b/mails/backends/filebased.py
@@ -1,11 +1,11 @@
from django.conf import settings
-from django.core.mail.backends.filebased import EmailBackend as FileBacked
+from django.core.mail.backends.filebased import EmailBackend as FileBackend
from django.core.mail.message import sanitize_address
from ..models import MailLog
-class EmailBackend(FileBacked):
+class EmailBackend(FileBackend):
def write_message(self, message):
bcc_str = ', '.join(message.bcc).encode()
self.stream.write(b'Extended Mail FileBasedBackend\n\n')
@@ -13,7 +13,7 @@ class EmailBackend(FileBacked):
super().write_message(message)
-class ModelEmailBackend(FileBacked):
+class ModelEmailBackend(FileBackend):
def send_messages(self, email_messages, force_original=False):
"""Write all messages to the stream in a thread-safe way."""
if force_original:
@@ -51,7 +51,8 @@ class ModelEmailBackend(FileBacked):
content_object = None
mail_code = ''
- if 'delayed_processing' in email_message.extra_headers and email_message.extra_headers:
+ if 'delayed_processing' in email_message.extra_headers \
+ and email_message.extra_headers['delayed_processing']:
status = 'not_rendered'
content_object = email_message.extra_headers.get('content_object', None)
mail_code = email_message.extra_headers.get('mail_code', '')
diff --git a/mails/forms.py b/mails/forms.py
index bd262c46b73bb78a93109d889038d3efd07062b4..472ae255b8594ec19449317df834a35ce395e4e8 100644
--- a/mails/forms.py
+++ b/mails/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/managers.py b/mails/managers.py
index 782b3ebdefe6f72d467558879ad6d3e59c89939a..de2ff78234e527a68c6565876ee2af0844ff1ed7 100644
--- a/mails/managers.py
+++ b/mails/managers.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.db import models
diff --git a/mails/mixins.py b/mails/mixins.py
index 00a40447701e0dd7e3247f6eadf22092f9f64fef..902707b1adeff763992068f2d24b35f2063c1e5f 100644
--- a/mails/mixins.py
+++ b/mails/mixins.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/models.py b/mails/models.py
index 88d210eeca6dfc20e78688c37f2ae5c3c1e972b9..5911812cdc316b0161168d09188eb74226a745a7 100644
--- a/mails/models.py
+++ b/mails/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/tests.py b/mails/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/mails/tests.py
+++ b/mails/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/utils.py b/mails/utils.py
index 9ac090d6e5a46ebd472bfed436dfcfaa1d2fe450..a1c49158e249ddb54c527e654e187c312b56d3a3 100644
--- a/mails/utils.py
+++ b/mails/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/views.py b/mails/views.py
index 441de09f6678fd0e7ae8a138c53969ec8718d538..9aa031d86ea309074213fc11f82097f2d64aefc0 100644
--- a/mails/views.py
+++ b/mails/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/mails/widgets.py b/mails/widgets.py
index d13bcf86bc4f2a7111d0cfc96f5d0e5af5ab4f53..a41673cc7e73a1eab022018d81a6eb73a111c423 100644
--- a/mails/widgets.py
+++ b/mails/widgets.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/admin.py b/news/admin.py
index 930497da41a2975e0f47a2f327484c08e5f0ea2d..f1332045ba4f46fd5047d14884784c746b0af692 100644
--- a/news/admin.py
+++ b/news/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/apps.py b/news/apps.py
index 273ff7682af3cc14e87213b7696a58c233930fa8..718d5df038cd27c66b51d4c380cd9d16125b8de1 100644
--- a/news/apps.py
+++ b/news/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/factories.py b/news/factories.py
index 30ad31ce31db873c0640e3da17b378358b271faf..9288aaaeb895cc06aa456b26b4257689673a3ab2 100644
--- a/news/factories.py
+++ b/news/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/forms.py b/news/forms.py
index 3e63731157969d2a2cbb02edefb8a02d8b5b40d0..93a559350be5ec089f650892e59a86900ce29994 100644
--- a/news/forms.py
+++ b/news/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/management/commands/create_news.py b/news/management/commands/create_news.py
index 1bb10186202cf5030814cfc0b2d145dc60b96814..02a47a3ff82abcd8c1b62afa08b983239ae6c570 100644
--- a/news/management/commands/create_news.py
+++ b/news/management/commands/create_news.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/managers.py b/news/managers.py
index c8dad230d9f142e6a72d8837c20804bfe1f1d851..c2658c7ee31ac5cca4e47b52a047aa29589d2b32 100644
--- a/news/managers.py
+++ b/news/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/models.py b/news/models.py
index 2e151fde38470a0d1c1b4002d427c5cc7035e9f5..940264a5e66071a7e5b36aff880e7a34309a9773 100644
--- a/news/models.py
+++ b/news/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/serializers.py b/news/serializers.py
index 4ac02815d0bc1757a85f99bc9d7b0a3552c01ae3..e8d8c66cb1403508a9d970c3c00e83c536bf62f6 100644
--- a/news/serializers.py
+++ b/news/serializers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/templates/news/base.html b/news/templates/news/base.html
new file mode 100644
index 0000000000000000000000000000000000000000..2dc4d1da07b65e97ab4ca349975cdeeb4fabca33
--- /dev/null
+++ b/news/templates/news/base.html
@@ -0,0 +1,15 @@
+{% extends 'scipost/base.html' %}
+
+{% block body_class %}{{ block.super }} Submissions{% endblock %}
+
+{% block breadcrumb %}
+ <div class="breadcrumb-container">
+ <div class="container">
+ <nav class="breadcrumb">
+ {% block breadcrumb_items %}
+ <a href="{% url 'news:news' %}" class="breadcrumb-item">News</a>
+ {% endblock %}
+ </nav>
+ </div>
+ </div>
+{% endblock %}
diff --git a/news/templates/news/news_manage.html b/news/templates/news/news_manage.html
index 6d734f0f360277c872af7214933e7691e064dba0..b17d53966908450b1c4fcc563222b6c722f314b3 100644
--- a/news/templates/news/news_manage.html
+++ b/news/templates/news/news_manage.html
@@ -1,19 +1,12 @@
-{% extends 'scipost/base.html' %}
+{% extends 'news/base.html' %}
{% load bootstrap %}
{% block pagetitle %}: News Management{% endblock pagetitle %}
-{% block breadcrumb %}
- <nav class="breadcrumb-nav">
- <div class="container">
- <ol class="breadcrumb">
- <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li>
- <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span>
- <li class="breadcrumb-item active">News Management</span>
- </ol>
- </div>
- </nav>
+{% block breadcrumb_items %}
+ {{ block.super }}
+ <span class="breadcrumb-item">News Management</span>
{% endblock %}
{% block content %}
diff --git a/news/templates/news/newsitem_confirm_delete.html b/news/templates/news/newsitem_confirm_delete.html
index cd82b762d74ccde92ddff0b6bdd7ddab7f14e56a..488ff7b3d9a297024e5163b89486c1642d9c2855 100644
--- a/news/templates/news/newsitem_confirm_delete.html
+++ b/news/templates/news/newsitem_confirm_delete.html
@@ -1,21 +1,13 @@
-{% extends 'scipost/base.html' %}
+{% extends 'news/base.html' %}
{% load bootstrap %}
{% block pagetitle %}: Delete News Item{% endblock pagetitle %}
-
-{% block breadcrumb %}
- <nav class="breadcrumb-nav">
- <div class="container">
- <ol class="breadcrumb">
- <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li>
- <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span>
- <li class="breadcrumb-item"><a href="{% url 'news:manage' %}">News Management</a></span>
- <li class="breadcrumb-item active" aria-current="page">Delete {{ object.headline|truncatechars:20 }}</span>
- </ol>
- </div>
- </nav>
+{% block breadcrumb_items %}
+ {{ block.super }}
+ <a href="{% url 'news:manage' %}" class="breadcrumb-item">News Management</a>
+ <span class="breadcrumb-item">Delete {{ object.headline|truncatechars:20 }}</span>
{% endblock %}
{% block content %}
diff --git a/news/templates/news/newsitem_list.html b/news/templates/news/newsitem_list.html
index c1a590bdadd3752b8738131a831853a59597581d..666505d914c53bba4e12f21ec64418948922e3c7 100644
--- a/news/templates/news/newsitem_list.html
+++ b/news/templates/news/newsitem_list.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/base.html' %}
+{% extends 'news/base.html' %}
{% block pagetitle %}: News{% endblock pagetitle %}
@@ -6,18 +6,11 @@
{% load staticfiles %}
-{% block breadcrumb %}
- <nav class="breadcrumb-nav">
- <div class="container">
- <ol class="breadcrumb">
- <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li>
- <li class="breadcrumb-item active" aria-current="page">News</span>
- </ol>
- </div>
- </nav>
+{% block breadcrumb_items %}
+ <a href="{% url 'scipost:index' %}" class="breadcrumb-item">Home</a>
+ <span class="breadcrumb-item">News</span>
{% endblock %}
-
{% block content %}
<div class="row">
diff --git a/news/templates/news/newsitem_update.html b/news/templates/news/newsitem_update.html
index 85af2b0902b4f4506ce094bbb9d2804096aafde7..ae3b131c4574d333f6d4246cb42fea4b81371d8b 100644
--- a/news/templates/news/newsitem_update.html
+++ b/news/templates/news/newsitem_update.html
@@ -1,21 +1,13 @@
-{% extends 'scipost/base.html' %}
+{% extends 'news/base.html' %}
{% load bootstrap %}
{% block pagetitle %}: News Items{% endblock pagetitle %}
-
-{% block breadcrumb %}
- <nav class="breadcrumb-nav">
- <div class="container">
- <ol class="breadcrumb">
- <li class="breadcrumb-item"><a href="{% url 'scipost:index' %}" >Home</a></li>
- <li class="breadcrumb-item"><a href="{% url 'news:news' %}" >News</a></span>
- <li class="breadcrumb-item"><a href="{% url 'news:manage' %}">News Management</a></span>
- <li class="breadcrumb-item active" aria-current="page">{{ object.headline|truncatechars:20 }}</span>
- </ol>
- </div>
- </nav>
+{% block breadcrumb_items %}
+ {{ block.super }}
+ <a href="{% url 'news:manage' %}" class="breadcrumb-item">News Management</a>
+ <span class="breadcrumb-item">{{ object.headline|truncatechars:20 }}</span>
{% endblock %}
diff --git a/news/tests.py b/news/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/news/tests.py
+++ b/news/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/urls.py b/news/urls.py
index 01e0dc5cabc1860d156444d517e243f07e79d0ee..fa0d1f5245f3a5cc2ccf43a1902f5a30340b705d 100644
--- a/news/urls.py
+++ b/news/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/views.py b/news/views.py
index e9878b9d1b6824c87652afd0931d007d682dbad0..2b64d3c4dd12555d53daac6b8d014f6f72e3d5f0 100644
--- a/news/views.py
+++ b/news/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/news/viewsets.py b/news/viewsets.py
index 118d614882b86de21647d48396f9a3fac4fe0ac0..307af9dbf86ed0d77560c1b9b7ccc64403288f0f 100644
--- a/news/viewsets.py
+++ b/news/viewsets.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/__init__.py b/notifications/__init__.py
index f9eafdc9ae454a919ceb9917143b3cdcb44b90f7..3453076d474d16f65e10212363ca903bac053040 100644
--- a/notifications/__init__.py
+++ b/notifications/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/admin.py b/notifications/admin.py
index fcdd8edafb96ad31f36211518b7a63e33081ffb1..1c922e31183270760d29577d58c3343900e565d4 100644
--- a/notifications/admin.py
+++ b/notifications/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/apps.py b/notifications/apps.py
index e41c5bec7b1e69ab21a41b68d1de2dc7fd51aee8..13cba879a76fe282106c0a334153fd4ccf99c20d 100644
--- a/notifications/apps.py
+++ b/notifications/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/constants.py b/notifications/constants.py
index a2c0e29fec4317e773344324e64a9c20d02b6adc..8490099d261fa134fcb146372635b85828fe8c6d 100644
--- a/notifications/constants.py
+++ b/notifications/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/managers.py b/notifications/managers.py
index b193c31122b8c37da153e2a71574cc1f2e0e0a95..d3dfe8365d581716df15416e55cab40f171a9984 100644
--- a/notifications/managers.py
+++ b/notifications/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/models.py b/notifications/models.py
index fa02efaef64b47e0052615cabf37a62940e89475..65b4d5055513e63ba96de5147a21df4a1cbe9dc2 100644
--- a/notifications/models.py
+++ b/notifications/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/signals.py b/notifications/signals.py
index f386cf4eb3419d4bd376c460ec22397489d5c317..3d079205b7f59496374141f3a6954d4ea00d6418 100644
--- a/notifications/signals.py
+++ b/notifications/signals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/templatetags/notifications_tags.py b/notifications/templatetags/notifications_tags.py
index 347616c83b90b205300b7c2d3abf04eef36a693b..1044d2b1ffed62516dac001f3e4c824771052049 100644
--- a/notifications/templatetags/notifications_tags.py
+++ b/notifications/templatetags/notifications_tags.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/tests.py b/notifications/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/notifications/tests.py
+++ b/notifications/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/urls.py b/notifications/urls.py
index 1779d14ba7e8c12b3e1c09caa5eb16f362b831f0..397f2e65eeab52604b3fe59f6b6b30b96300f85c 100644
--- a/notifications/urls.py
+++ b/notifications/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/utils.py b/notifications/utils.py
index d5407524b4df9877b1b20fffa3cf7bcd3f5bb249..887083b2813a346d6ff46996cbfd8fc2c8839dac 100644
--- a/notifications/utils.py
+++ b/notifications/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/notifications/views.py b/notifications/views.py
index 4bd31d8bbcad49ae37614f638f0be0ab1bf1614c..ec2642156f823fdbd01bdeb1f02da67bfbcd7d5b 100644
--- a/notifications/views.py
+++ b/notifications/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/ontology/admin.py b/ontology/admin.py
index b96b7a073459ca7b67327c9a34f5d176d20f7b56..9a68bf929d5597efecbc6dfb429dc6bf73868069 100644
--- a/ontology/admin.py
+++ b/ontology/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/ontology/constants.py b/ontology/constants.py
index b3b1e8df00473de09288c0b55c5ac5cffb57eb14..0133c0bbdacc71d39e0b7d640a9d268d3b3c6e2c 100644
--- a/ontology/constants.py
+++ b/ontology/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/ontology/forms.py b/ontology/forms.py
index ab23a61ebc930726011364278c631fa462a56064..74b3f36043643b81e7402514507b76c352cf93b1 100644
--- a/ontology/forms.py
+++ b/ontology/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/ontology/models.py b/ontology/models.py
index c429495c82b1b14822d30ab78d12912be403aa48..ad853e03e9f0b1a47ff5b272caeada25d1345f3c 100644
--- a/ontology/models.py
+++ b/ontology/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/ontology/templatetags/lookup.py b/ontology/templatetags/lookup.py
index 1e2b3d5616f9bda2e215ab523d13a083eeacb04a..e2159a5258208aa02d11958aefd2b2684118aa8a 100644
--- a/ontology/templatetags/lookup.py
+++ b/ontology/templatetags/lookup.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/ontology/urls.py b/ontology/urls.py
index e7c1ad356250154f8f48591541de866b3ec57e9b..aeb6746791d8388afbf9ac0010f834232ff879c9 100644
--- a/ontology/urls.py
+++ b/ontology/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/ontology/views.py b/ontology/views.py
index b5fbbb88c37fb08612b5fabc53b41916eeb94ffe..7956dba96e7e15fcb877395815cba9cc4d643e09 100644
--- a/ontology/views.py
+++ b/ontology/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/organizations/admin.py b/organizations/admin.py
index 8d33bd306da296a3d6f985c8f8377092312dde73..4a405966382ae20ae2223bd8e2e1309d7b0bca6c 100644
--- a/organizations/admin.py
+++ b/organizations/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/organizations/constants.py b/organizations/constants.py
index 06ecf272b554cd307f0c89e52bf3be7d34c81b02..6a6056ac8557cae158ec3e826c3854e3ca011110 100644
--- a/organizations/constants.py
+++ b/organizations/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/organizations/managers.py b/organizations/managers.py
index 50803e1393b32bfe574b9fdf0953826b9e90dbbc..89b28d7b02428ef8852ae0555ccc4840640577e8 100644
--- a/organizations/managers.py
+++ b/organizations/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/organizations/models.py b/organizations/models.py
index 291f8203e494316af8e9f1f2846ca652eb2d33e4..e2aded3dbe630b025a2c898c79cb2ba35b2d1272 100644
--- a/organizations/models.py
+++ b/organizations/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/organizations/templatetags/organizations_extras.py b/organizations/templatetags/organizations_extras.py
index 513ec33f3a1a4491fb71960d24662a693196a684..da588190d127928f588a98b71f4c3ffac6b45522 100644
--- a/organizations/templatetags/organizations_extras.py
+++ b/organizations/templatetags/organizations_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/organizations/urls.py b/organizations/urls.py
index ecfa582c482686c60c16c2661649dd6864209707..5ad00b7c7a45ae2669a3ec20f83af4aec4bc9264 100644
--- a/organizations/urls.py
+++ b/organizations/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/organizations/views.py b/organizations/views.py
index 30dfbff9c0da0a16686f571080a7e2599de326d2..0896d310848600ed8130d355b8bd1babfe86b6f6 100644
--- a/organizations/views.py
+++ b/organizations/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/__init__.py b/partners/__init__.py
index 650cbb628cc2ab169be5dc6364e462e85afd4b6f..2f487cf4b56298795ea77bd87c3313168c6d5731 100644
--- a/partners/__init__.py
+++ b/partners/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/admin.py b/partners/admin.py
index 88d5592046548dd8b5f437b6786a1a73ec0558c7..8e21caddeedf320a9c99787706d7b12758fa3a62 100644
--- a/partners/admin.py
+++ b/partners/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/apps.py b/partners/apps.py
index a1cb209a7901e33052db4194058b19b62a569996..cdbd78a574d87361a2dcfdf694a6a2ff3025d198 100644
--- a/partners/apps.py
+++ b/partners/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/constants.py b/partners/constants.py
index 31f301c3e44ea67c8bdbf68fd1e5b3dc67a7ac85..6cacd5574c3b4ef9abfcfa97d588a12e69013a17 100644
--- a/partners/constants.py
+++ b/partners/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/decorators.py b/partners/decorators.py
index 282c911031c5c40e4d80a4ef10c5995d8ad4813a..d446b1b7dd029c398db4bfbee476de702c148014 100644
--- a/partners/decorators.py
+++ b/partners/decorators.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/forms.py b/partners/forms.py
index dc4fe752acdbd9860b72913388e2d90b22bba95c..7696a6b10efae69c4a3f50f9d5d8eaea67c63d57 100644
--- a/partners/forms.py
+++ b/partners/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/management/commands/organization_update_cf_nr_associated_publications.py b/partners/management/commands/organization_update_cf_nr_associated_publications.py
index 6057f6bf7ab19c930c532a97b61c945579ff2cbf..2aa9c264bcc17c67dccad713f68b4dcf21c50500 100644
--- a/partners/management/commands/organization_update_cf_nr_associated_publications.py
+++ b/partners/management/commands/organization_update_cf_nr_associated_publications.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/managers.py b/partners/managers.py
index f969cd45188399844ba6c04e8eb1607eb7d43861..120686669ea5ec5eeed713f6e1d9922dba581fdc 100644
--- a/partners/managers.py
+++ b/partners/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/models.py b/partners/models.py
index b0cdfcb548deaa4cfbe2de5ad4f87a2dd5076f20..fbcd487e7c2718392010ab830426c792a09aa6eb 100644
--- a/partners/models.py
+++ b/partners/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/signals.py b/partners/signals.py
index 43fddbb3681a3c416fe20a20fff5d0a040138827..e3c1f6d935a0292119b19219a39aba98a083f0b7 100644
--- a/partners/signals.py
+++ b/partners/signals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/templatetags/partners_extras.py b/partners/templatetags/partners_extras.py
index 5842a2f02aa15dbf677ca11a42d337e406b0a711..9930859ca9a4d5905beb374c4fe2311b8b9ac07c 100644
--- a/partners/templatetags/partners_extras.py
+++ b/partners/templatetags/partners_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/tests.py b/partners/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/partners/tests.py
+++ b/partners/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/urls.py b/partners/urls.py
index a514a4c665da8aa5efcd96a8e30f0073294a3ae7..94c869e7a0a335d4da93ab8b5882e033667882b0 100644
--- a/partners/urls.py
+++ b/partners/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/utils.py b/partners/utils.py
index 9b872f9a5976bdd6601a354ce3c311b2575f6d9c..3bd7302312ef8a6da5c41f675cb689c4adc8cd91 100644
--- a/partners/utils.py
+++ b/partners/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/partners/views.py b/partners/views.py
index 4f3520a7d739fd277987b0987c80059c15590609..681490166f35a05449903175ffd39bbdb3bc796c 100644
--- a/partners/views.py
+++ b/partners/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -115,7 +115,7 @@ def membership_request(request):
return render(request, 'partners/membership_request.html', context)
-@permission_required('scipost.can_promote_to_production_team', return_403=True)
+@permission_required('scipost.can_manage_organizations', return_403=True)
@transaction.atomic
def promote_prospartner(request, prospartner_id):
prospartner = get_object_or_404(ProspectivePartner.objects.not_yet_partner(),
diff --git a/petitions/admin.py b/petitions/admin.py
index 826a4485ef9e8220849c1a0597a8bc9e76aa3a84..82163eb0469a5883ab1411a7ccbff7850158444c 100644
--- a/petitions/admin.py
+++ b/petitions/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/apps.py b/petitions/apps.py
index 28e7539a61200db641fbb833c32c14de5c11e663..46ca2efcca386c92b5c057b513af570e07494590 100644
--- a/petitions/apps.py
+++ b/petitions/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/forms.py b/petitions/forms.py
index a201f06bbb2d4c5d89b89d9adbe77c8c1ac631b4..0172dcb4f2273722601431094c89462c38cb9b9b 100644
--- a/petitions/forms.py
+++ b/petitions/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/managers.py b/petitions/managers.py
index 6e53a4337763fae2af9ef0aaca1c57d83d155b45..18aa25d0524813bf6d7202d623d255c50bc4b486 100644
--- a/petitions/managers.py
+++ b/petitions/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/models.py b/petitions/models.py
index bcd50ed24d94038ca48f0720117702ce9b4a1192..3c907c13d9c88b6422a8c618993ecc0948348c28 100644
--- a/petitions/models.py
+++ b/petitions/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/tests.py b/petitions/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/petitions/tests.py
+++ b/petitions/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/urls.py b/petitions/urls.py
index e77d597e06c8be5a399a975d95c273c274c163b8..e400ae55159087f3cc1299daee6683d1df858030 100644
--- a/petitions/urls.py
+++ b/petitions/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/utils.py b/petitions/utils.py
index 792e406002bbf339abdcd8bfacb9c41d31f6499b..80108b4b2986b1b0de6cd5f3739d7484c819c25c 100644
--- a/petitions/utils.py
+++ b/petitions/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/petitions/views.py b/petitions/views.py
index 7656b2fa78d00aac817c8db82dd3a6709d517484..0db24cc9e5a287553371de86020a3a5fc83b2e61 100644
--- a/petitions/views.py
+++ b/petitions/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/preprints/admin.py b/preprints/admin.py
index 007cfbf4903795f8692ddfca7f7c143f523759a5..9474af158fb3ca2f81d9ee6d4a19d9a18701c623 100644
--- a/preprints/admin.py
+++ b/preprints/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/preprints/apps.py b/preprints/apps.py
index 7895e6c44d3070d13dcb1b2b3ef1b57a2a20226c..2c392390c6dce2fec6f3e4bc52b7f587097d1dbb 100644
--- a/preprints/apps.py
+++ b/preprints/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/preprints/helpers.py b/preprints/helpers.py
index 1af7fba21670c593835cbbb0a1f1a3a6360490d8..8c18ae9567a0ddd615ca91fd3cd2e7eacf8fed9e 100644
--- a/preprints/helpers.py
+++ b/preprints/helpers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/preprints/models.py b/preprints/models.py
index 443f8ddc584cbeab11181939437e09eb69258a7c..4a1e064194297cbdb1381b98439b26d24131418d 100644
--- a/preprints/models.py
+++ b/preprints/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/preprints/tests.py b/preprints/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/preprints/tests.py
+++ b/preprints/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/preprints/urls.py b/preprints/urls.py
index bb01e05f5242c61471cbc17f83aeebf3ecd1d92b..87a0001344ec2390d5a125610e08e99631032707 100644
--- a/preprints/urls.py
+++ b/preprints/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/preprints/views.py b/preprints/views.py
index 340afc48895810952fb842b9099badb7aa184c6b..e8db3f2f9b704379a552bdd665dd650ea49ecc6d 100644
--- a/preprints/views.py
+++ b/preprints/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
import os
diff --git a/proceedings/admin.py b/proceedings/admin.py
index 21dcca4d719214ebbacd30755f81c34aecb5e686..f40c2a614c381d933254d8a9562e6b534fc9e7db 100644
--- a/proceedings/admin.py
+++ b/proceedings/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/proceedings/apps.py b/proceedings/apps.py
index 1470c75a69652af7d9e283103915ae6f2c1774cb..6ac347f5c52b84a83fe8bb183c4d22339b18cf28 100644
--- a/proceedings/apps.py
+++ b/proceedings/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/proceedings/forms.py b/proceedings/forms.py
index d83f9c21c25598e6de584be368a9e02315bc0a4c..8d5fda042821d04fa6f9a6a7070d141ee12ede40 100644
--- a/proceedings/forms.py
+++ b/proceedings/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/proceedings/managers.py b/proceedings/managers.py
index 1a2eed24891c1c07a1e2a6fb5f6055765f87d89e..fe536b5e0898ffe3e642d3eef960b98aba307012 100644
--- a/proceedings/managers.py
+++ b/proceedings/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/proceedings/models.py b/proceedings/models.py
index cf5d45b61e420def2a9a74868e7b89063b16e46c..3e55c716cb8d66a23405193e1a10927c22bcb77c 100644
--- a/proceedings/models.py
+++ b/proceedings/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/proceedings/tests.py b/proceedings/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/proceedings/tests.py
+++ b/proceedings/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/proceedings/urls.py b/proceedings/urls.py
index a7aa88c1d86ace1a1502a2fe8ee1953d0cc4c0b7..987cf25ab3cb6d7462d93020d145d407a1a646f6 100644
--- a/proceedings/urls.py
+++ b/proceedings/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/proceedings/views.py b/proceedings/views.py
index e73802fa18e32ed72994f04d126bd7d0ec42b9e6..4f1b54fcc4ae8a9cee121b733a71ac6c58a07313 100644
--- a/proceedings/views.py
+++ b/proceedings/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/__init__.py b/production/__init__.py
index 5c140973e992e3925e8989a6b1ba635ff101c918..37f786344eff177b03b52784011734c82a5835de 100644
--- a/production/__init__.py
+++ b/production/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/admin.py b/production/admin.py
index a0dff4a66aeb6f772e10de0010b56477d035297e..7d25d09e34181c214476a4080134a74ebfad87e8 100644
--- a/production/admin.py
+++ b/production/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/apps.py b/production/apps.py
index 8521e98d50d09fc2c9ffe66a0cdeb65841a33331..fa6cb85c69967a82c1d28c2c0eae837b66f4fca2 100644
--- a/production/apps.py
+++ b/production/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/constants.py b/production/constants.py
index 26fc4d0ec9d57282e6f72c6af1e3d4fc5b44764e..0a130e2a1589246f9d732c413b65d8f64d9a1620 100644
--- a/production/constants.py
+++ b/production/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/forms.py b/production/forms.py
index 350e1bc6276ab7b57c386823d0fbf508ca12ac80..afb832597a34012dcbea5fce9f476a6fd81c7e71 100644
--- a/production/forms.py
+++ b/production/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -7,6 +7,8 @@ import datetime
from django import forms
from django.contrib.auth import get_user_model
+from scipost.fields import UserModelChoiceField
+
from . import constants
from .models import ProductionUser, ProductionStream, ProductionEvent, Proofs,\
ProductionEventAttachment
@@ -127,11 +129,6 @@ class StreamStatusForm(forms.ModelForm):
return stream
-class UserModelChoiceField(forms.ModelChoiceField):
- def label_from_instance(self, obj):
- return '{}, {} ({})'.format(obj.last_name, obj.first_name, obj.email)
-
-
class UserToOfficerForm(forms.ModelForm):
user = UserModelChoiceField(queryset=get_user_model().objects.filter(
production_user__isnull=True).order_by('last_name'))
diff --git a/production/managers.py b/production/managers.py
index 5595eb6b3aeb44c19f90d667394e76d03b185e98..32887819569df39e25d998d0f23858cb09eaaa40 100644
--- a/production/managers.py
+++ b/production/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/models.py b/production/models.py
index 8b2c4bbafc5d93ffcc431a46921840ce68d3c54e..06f1a06feb49a2fe26ed3f677902f415c1b81589 100644
--- a/production/models.py
+++ b/production/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/permissions.py b/production/permissions.py
index a6eb4a9fdb38c29407b6303ab9d51594c86081fc..95723d4bf79ae044664d678d85555fa5d019e182 100644
--- a/production/permissions.py
+++ b/production/permissions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/signals.py b/production/signals.py
index 5aad5d05f4c193c83a56564aee40781138daa8b9..208107ea0f797a1fcc957fb367b69c1db6bce6b6 100644
--- a/production/signals.py
+++ b/production/signals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/tests.py b/production/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/production/tests.py
+++ b/production/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/urls.py b/production/urls.py
index 4f7f713055a9f959c834326365128329a6313827..6ebda5e62dfc71fba1377f06c8f5a192e8fd1967 100644
--- a/production/urls.py
+++ b/production/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/production/utils.py b/production/utils.py
index 1691347a2ea47f89243787959209630529872fe5..ec9b8d988ac723b8f96d9f9be304aeebeb1961d0 100644
--- a/production/utils.py
+++ b/production/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
from django.contrib.auth.models import Group
diff --git a/production/views.py b/production/views.py
index 613a4ca9c918f239626d936dbe6a162eac1c7cd8..b8e04de72bb5a86f4d0ab78e5f0dd5ce34ae26e1 100644
--- a/production/views.py
+++ b/production/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -74,7 +74,7 @@ def production(request, stream_id=None):
if request.user.has_perm('scipost.can_view_timesheets'):
context['production_team'] = ProductionUser.objects.active()
- if request.user.has_perm('scipost.can_promote_to_production_team'):
+ if request.user.has_perm('scipost.can_promote_user_to_production_officer'):
context['production_officers'] = ProductionUser.objects.active()
context['new_officer_form'] = UserToOfficerForm()
return render(request, 'production/production.html', context)
diff --git a/profiles/admin.py b/profiles/admin.py
index 771c7c3b119dc26e079bbe7e7db65b47737a9853..1b54b2c2a72c5d9253e0c89c62ec59d0c5cce768 100644
--- a/profiles/admin.py
+++ b/profiles/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/profiles/apps.py b/profiles/apps.py
index 5501fdad352cf444c6a7fd60ecd52b5d00729aa9..9644857bbd4a0eddc59b2f57bb7672ef800d367f 100644
--- a/profiles/apps.py
+++ b/profiles/apps.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.apps import AppConfig
diff --git a/profiles/constants.py b/profiles/constants.py
index c0298acf36a387695c3ef9a060b2e9eb55766c8f..fb7c120de3db2c927f5fbab193a24b4adffff12c 100644
--- a/profiles/constants.py
+++ b/profiles/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/profiles/forms.py b/profiles/forms.py
index 0ec066920a5839c5e207eb1800df5f6cb4c4dfc5..dfba810721e71273c78feab0bfdf397948b161e2 100644
--- a/profiles/forms.py
+++ b/profiles/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/profiles/managers.py b/profiles/managers.py
index 804e0b7ccf5b72e48bf8e4267027a957c2394fa4..556d1af12dd01dd665df986926f745aab885043f 100644
--- a/profiles/managers.py
+++ b/profiles/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/profiles/migrations/0016_auto_20190118_1902.py b/profiles/migrations/0016_auto_20190118_1902.py
new file mode 100644
index 0000000000000000000000000000000000000000..cb4af149ef0f3e708172a196fac7afdb65b91225
--- /dev/null
+++ b/profiles/migrations/0016_auto_20190118_1902.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-18 18:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('profiles', '0015_auto_20181118_0849'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='profile',
+ name='webpage',
+ field=models.URLField(blank=True, max_length=300),
+ ),
+ ]
diff --git a/profiles/migrations/0017_auto_20190126_2058.py b/profiles/migrations/0017_auto_20190126_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..c29f08e7c4ec95d2c0c1a898469dce96b2353efe
--- /dev/null
+++ b/profiles/migrations/0017_auto_20190126_2058.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import scipost.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('profiles', '0016_auto_20190118_1902'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='profile',
+ name='expertises',
+ field=scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], max_length=10), blank=True, null=True, size=None),
+ ),
+ ]
diff --git a/profiles/models.py b/profiles/models.py
index 93da3c30ebafd65a0c8367848581e800581c4c27..2a7e9b5af27a07ebd2069a4c7ec0265d2082896c 100644
--- a/profiles/models.py
+++ b/profiles/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -55,7 +55,7 @@ class Profile(models.Model):
blank=True, null=True)
orcid_id = models.CharField(max_length=20, verbose_name="ORCID id",
blank=True, validators=[orcid_validator])
- webpage = models.URLField(blank=True)
+ webpage = models.URLField(max_length=300, blank=True)
# Topics for semantic linking
topics = models.ManyToManyField('ontology.Topic', blank=True)
diff --git a/profiles/templatetags/lookup.py b/profiles/templatetags/lookup.py
index c6d629efc39d6b38b4e36e6368bddb3aab874f93..37f4ca7deede01a3a208a1d319afbe4cd810a902 100644
--- a/profiles/templatetags/lookup.py
+++ b/profiles/templatetags/lookup.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/profiles/templatetags/profiles_extras.py b/profiles/templatetags/profiles_extras.py
index f8c0ec82941ef7a4352a239f06ba922a4fbd870d..0f00a482e88f35b4ac7927bf713d3c1186ec306b 100644
--- a/profiles/templatetags/profiles_extras.py
+++ b/profiles/templatetags/profiles_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/profiles/tests.py b/profiles/tests.py
index 7ce503c2dd97ba78597f6ff6e4393132753573f6..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/profiles/tests.py
+++ b/profiles/tests.py
@@ -1,3 +1,7 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
from django.test import TestCase
# Create your tests here.
diff --git a/profiles/urls.py b/profiles/urls.py
index 9d693d9f8044dda2ea5b2c32402ca05ab5cfa66d..5fc21faf8468a389094722ae9bd8478528b61237 100644
--- a/profiles/urls.py
+++ b/profiles/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/profiles/views.py b/profiles/views.py
index 4ece47f98d620478e2d9520997534d56f85ba973..33aee843b4fb8fe2244c4c8ca20c079d7654b5e4 100644
--- a/profiles/views.py
+++ b/profiles/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/requirements.txt b/requirements.txt
index d96ced8b7e1612849193b4f8f85fabf60d5c11e4..afc7a6dbd63ce9627f2dd28bcb7887d4dfe8a5ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -44,7 +44,7 @@ Whoosh==2.7.4 # Directly related to Haystack.
# Python Utils
ithenticate-api-python==0.8
mailchimp3==2.0.15
-python-dateutil==2.6.0 # Doesn't Django have this functionality built-in? -- JdW
+python-dateutil==2.6.0
Pillow==3.4.2 # Latest version is v4.2.1; need to know about usage before upgrade. -- JdW
html2text
diff --git a/scipost/__init__.py b/scipost/__init__.py
index ba7a401eccd714a2ae882b411a299c3dec0511a3..19e3ffccd683b0c3b1ff1f8d01f4d6092ed4679b 100644
--- a/scipost/__init__.py
+++ b/scipost/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/admin.py b/scipost/admin.py
index 5eeb7a855d3aee19a0c8f6b606f1eb37610d15ae..68435d47199dfc51210a290305d02703b8902eb7 100644
--- a/scipost/admin.py
+++ b/scipost/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/apps.py b/scipost/apps.py
index dc85270be540e04f9e27b56e78435f2e25c5bc66..d9da7e620dd488d3138a2d9394021d0053800f24 100644
--- a/scipost/apps.py
+++ b/scipost/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/behaviors.py b/scipost/behaviors.py
index c7771e7ec60f87407bac5ed143d27c40a5a0651f..67f83903bbb372626ad760e7c5c1e77cc4a618bc 100644
--- a/scipost/behaviors.py
+++ b/scipost/behaviors.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/constants.py b/scipost/constants.py
index dd7a72d42083715dfc7d0fa3db8fbca06b4c86f1..33cf831b34b3d8924f0a4016ff95f257c2f7b7f0 100644
--- a/scipost/constants.py
+++ b/scipost/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -20,6 +20,7 @@ SCIPOST_SUBJECT_AREAS = (
('Phys:BI', 'Biophysics'),
('Phys:CE', 'Condensed Matter Physics - Experiment'),
('Phys:CT', 'Condensed Matter Physics - Theory'),
+ ('Phys:CC', 'Condensed Matter Physics - Computational'),
('Phys:FD', 'Fluid Dynamics'),
('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'),
('Phys:HE', 'High-Energy Physics - Experiment'),
@@ -124,11 +125,13 @@ for k in subject_areas_raw_dict.keys():
# Contributor types
NEWLY_REGISTERED, NORMAL_CONTRIBUTOR = 'newly_registered', 'normal'
-NO_SCIENTIST, DOUBLE_ACCOUNT, OUT_OF_ACADEMIA = 'no_scientist', 'double_account', 'out_of_academia'
+UNVERIFIABLE_CREDENTIALS, NO_SCIENTIST = 'unverifiable', 'no_scientist'
+DOUBLE_ACCOUNT, OUT_OF_ACADEMIA = 'double_account', 'out_of_academia'
BARRED, DISABLED, DECEASED = 'barred', 'disabled', 'deceased'
CONTRIBUTOR_STATUSES = (
(NEWLY_REGISTERED, 'Newly registered'),
(NORMAL_CONTRIBUTOR, 'Normal user'),
+ (UNVERIFIABLE_CREDENTIALS, 'Unverifiable credentials'),
(NO_SCIENTIST, 'Not a professional scientist'),
(DOUBLE_ACCOUNT, 'Other account already exists'),
(OUT_OF_ACADEMIA, 'Out of academia'),
diff --git a/scipost/db/fields.py b/scipost/db/fields.py
index bfff08b23e7e8072389e3ca1e3546d40598eb31e..d3550711314af2249109b0666da5f9a5fcffe8f6 100644
--- a/scipost/db/fields.py
+++ b/scipost/db/fields.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/decorators.py b/scipost/decorators.py
index fea4dc361ee19a9b8c0909cdea45f6be1b3074ff..e56499c78f0717c57879f74b76643425fef040c2 100644
--- a/scipost/decorators.py
+++ b/scipost/decorators.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/factories.py b/scipost/factories.py
index d058e515701c72e7a0229d2e79af31867d51fd55..27ef1f8ff3b04a98a93802792e52d33f1ce161c8 100644
--- a/scipost/factories.py
+++ b/scipost/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/feeds.py b/scipost/feeds.py
index 504841769c3800bbd841f3c9f4c21c09b5c3ef4c..bd2c5f14be2435ce58b9e62f98f2455e5247bd49 100644
--- a/scipost/feeds.py
+++ b/scipost/feeds.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/fields.py b/scipost/fields.py
index eea67bdc958c6b0f287ab16403f6cfa16eb46f3c..e002c69defb4d747009e9ec280a95e54fcca689d 100644
--- a/scipost/fields.py
+++ b/scipost/fields.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
import json
@@ -87,3 +87,8 @@ class ReCaptchaField(forms.CharField):
self.error_messages['captcha_invalid']
)
return values[0]
+
+
+class UserModelChoiceField(forms.ModelChoiceField):
+ def label_from_instance(self, obj):
+ return '{}, {} ({})'.format(obj.last_name, obj.first_name, obj.email)
diff --git a/scipost/forms.py b/scipost/forms.py
index ae8cd11d205ce54247ab4324c54dbd4568c16f37..2ef9c84f4b6547b5552bb3fea9f2e24c59d9c2a6 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -25,8 +25,8 @@ from haystack.forms import ModelSearchForm as HayStackSearchForm
from .behaviors import orcid_validator
from .constants import (
- SCIPOST_DISCIPLINES, TITLE_CHOICES, SCIPOST_FROM_ADDRESSES, NO_SCIENTIST, DOUBLE_ACCOUNT,
- BARRED)
+ SCIPOST_DISCIPLINES, TITLE_CHOICES, SCIPOST_FROM_ADDRESSES,
+ UNVERIFIABLE_CREDENTIALS, NO_SCIENTIST, DOUBLE_ACCOUNT, BARRED)
from .decorators import has_contributor
from .fields import ReCaptchaField
from .models import Contributor, DraftInvitation, UnavailabilityPeriod, \
@@ -51,6 +51,7 @@ from virtualmeetings.models import Feedback, Nomination, Motion
REGISTRATION_REFUSAL_CHOICES = (
(None, '-'),
+ (UNVERIFIABLE_CREDENTIALS, 'unverifiable credentials'),
(NO_SCIENTIST, 'not a professional scientist (>= PhD student)'),
(DOUBLE_ACCOUNT, 'another account already exists for this person'),
(BARRED, 'barred from SciPost (abusive behaviour)')
@@ -720,4 +721,5 @@ class SendPrecookedEmailForm(forms.Form):
class ConfirmationForm(forms.Form):
confirm = forms.ChoiceField(widget=forms.RadioSelect,
- choices=((True, 'Confirm'), (False, 'Abort')))
+ choices=((True, 'Confirm'), (False, 'Abort')),
+ label='')
diff --git a/scipost/management/commands/add_groups_and_permissions.py b/scipost/management/commands/add_groups_and_permissions.py
index 975560f7acf876c7a27c9fdf27e6183ef3354acc..901687f2afd869c2f3fb4d36dab65d80b0c598fe 100644
--- a/scipost/management/commands/add_groups_and_permissions.py
+++ b/scipost/management/commands/add_groups_and_permissions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -58,10 +58,6 @@ class Command(BaseCommand):
codename='can_read_partner_page',
name='Can read Prospective Partner personal page',
content_type=content_type)
- can_promote_to_production_team, created = Permission.objects.get_or_create(
- codename='can_promote_to_production_team',
- name='Can promote Prospective Partner to Partner',
- content_type=content_type)
can_view_partners, created = Permission.objects.get_or_create(
codename='can_view_partners',
name='Can view Partner details of all Partners',
@@ -129,6 +125,18 @@ class Command(BaseCommand):
codename='can_attend_VGMs',
name='Can attend Virtual General Meetings',
content_type=content_type)
+ can_view_potentialfellowship_list, created = Permission.objects.get_or_create(
+ codename='can_view_potentialfellowship_list',
+ name='Can view PotentialFellowship list',
+ content_type=content_type)
+ can_add_potentialfellowship, created = Permission.objects.get_or_create(
+ codename='can_add_potentialfellowship',
+ name='Can add PotentialFellowship',
+ content_type=content_type)
+ can_vote_on_potentialfellowship, created = Permission.objects.get_or_create(
+ codename='can_vote_on_potentialfellowship',
+ name='Can vote on PotentialFellowship',
+ content_type=content_type)
# Contributions (not related to submissions)
can_submit_comments, created = Permission.objects.get_or_create(
@@ -346,7 +354,6 @@ class Command(BaseCommand):
can_promote_user_to_production_officer,
can_view_production,
can_view_all_production_streams,
- can_promote_to_production_team,
can_attend_VGMs,
can_view_timesheets,
can_manage_mailchimp,
@@ -355,6 +362,8 @@ class Command(BaseCommand):
can_create_profiles,
can_view_profiles,
can_manage_ontology,
+ can_view_potentialfellowship_list,
+ can_add_potentialfellowship,
])
FinancialAdmin.permissions.set([
@@ -367,6 +376,8 @@ class Command(BaseCommand):
can_create_registration_invitations,
can_attend_VGMs,
can_view_statistics,
+ can_view_potentialfellowship_list,
+ can_add_potentialfellowship,
])
EditorialAdmin.permissions.set([
@@ -398,6 +409,8 @@ class Command(BaseCommand):
can_create_profiles,
can_view_profiles,
can_manage_ontology,
+ can_view_potentialfellowship_list,
+ can_add_potentialfellowship,
])
EditorialCollege.permissions.set([
@@ -408,6 +421,9 @@ class Command(BaseCommand):
can_attend_VGMs,
can_view_statistics,
can_manage_ontology,
+ can_view_potentialfellowship_list,
+ can_add_potentialfellowship,
+ can_vote_on_potentialfellowship,
])
VettingEditors.permissions.set([
diff --git a/scipost/management/commands/check_celery.py b/scipost/management/commands/check_celery.py
index 4d5aa0dc702f437948fc5d4006fab2d9c005271f..2b54459fc806c2c47e04fbff40bc2be3be4fb5a6 100644
--- a/scipost/management/commands/check_celery.py
+++ b/scipost/management/commands/check_celery.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/management/commands/create_contributors.py b/scipost/management/commands/create_contributors.py
index 0e5882da3c1da92575e920d1528a35b11d933536..8aaf76438f2289bbc4334e28330af5ecb7dd6e23 100644
--- a/scipost/management/commands/create_contributors.py
+++ b/scipost/management/commands/create_contributors.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/management/commands/create_remarks.py b/scipost/management/commands/create_remarks.py
index 0bb05534b9ecfefe79aa31e82adb0a9f97407f82..27e45f99f523517b6691f82ed6ed74723eed3def 100644
--- a/scipost/management/commands/create_remarks.py
+++ b/scipost/management/commands/create_remarks.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/management/commands/export_contributors.py b/scipost/management/commands/export_contributors.py
index b65133354c429690e75b3cf9427f88a0173a9252..ee3ce5030706d9d370a5be07b9e7afc0778886aa 100644
--- a/scipost/management/commands/export_contributors.py
+++ b/scipost/management/commands/export_contributors.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/management/commands/populate_db.py b/scipost/management/commands/populate_db.py
index 048521014d7f05c245d84666c82c8aebf48ae55e..6b5e713e643c21fe8e31281cc1d9f827978c99c7 100644
--- a/scipost/management/commands/populate_db.py
+++ b/scipost/management/commands/populate_db.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/management/commands/setup_contributor.py b/scipost/management/commands/setup_contributor.py
index f4b98c3abb3404ebc1730601a1417ecc482dfc82..6e1fd0baf444085f88571731e95a5b5de97a733c 100644
--- a/scipost/management/commands/setup_contributor.py
+++ b/scipost/management/commands/setup_contributor.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/managers.py b/scipost/managers.py
index abf9abfe38b39e1f658563fd9d21abca2c243613..82aec61e35eb42dac89bb7a16948175fbfbd6c35 100644
--- a/scipost/managers.py
+++ b/scipost/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/migrations/0019_auto_20190115_0908.py b/scipost/migrations/0019_auto_20190115_0908.py
new file mode 100644
index 0000000000000000000000000000000000000000..0a76648609e0d633992f30160e60960c03fdeb47
--- /dev/null
+++ b/scipost/migrations/0019_auto_20190115_0908.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-15 08:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0018_contributor_duplicate_of'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='contributor',
+ name='personalwebpage',
+ field=models.URLField(blank=True, max_length=300, verbose_name='personal web page'),
+ ),
+ ]
diff --git a/scipost/migrations/0020_auto_20190126_2058.py b/scipost/migrations/0020_auto_20190126_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..76059cbf1d97d18885192c947da19b7d77f316aa
--- /dev/null
+++ b/scipost/migrations/0020_auto_20190126_2058.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import scipost.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0019_auto_20190115_0908'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='contributor',
+ name='expertises',
+ field=scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], max_length=10), blank=True, null=True, size=None),
+ ),
+ ]
diff --git a/scipost/migrations/0021_auto_20190126_2120.py b/scipost/migrations/0021_auto_20190126_2120.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5b4c50c4bec4e5a7bf135b7a10cb69bea0bf83d
--- /dev/null
+++ b/scipost/migrations/0021_auto_20190126_2120.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 20:20
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0020_auto_20190126_2058'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='remark',
+ options={'ordering': ['date']},
+ ),
+ ]
diff --git a/scipost/migrations/0022_auto_20190127_2021.py b/scipost/migrations/0022_auto_20190127_2021.py
new file mode 100644
index 0000000000000000000000000000000000000000..2b62fdaec0804d480776a8c9cb0018a8a606ee12
--- /dev/null
+++ b/scipost/migrations/0022_auto_20190127_2021.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-27 19:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0021_auto_20190126_2120'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='contributor',
+ name='status',
+ field=models.CharField(choices=[('newly_registered', 'Newly registered'), ('normal', 'Normal user'), ('unverifiable', 'Unverifiable credentials'), ('no_scientist', 'Not a professional scientist'), ('double_account', 'Other account already exists'), ('out_of_academia', 'Out of academia'), ('barred', 'Barred from SciPost'), ('disabled', 'Account disabled'), ('deceased', 'Person deceased')], default='newly_registered', max_length=16),
+ ),
+ ]
diff --git a/scipost/mixins.py b/scipost/mixins.py
index 3e9b2df5a6263534b493f92f153afc4612f22410..b1560c274c8e5d653ef5643feaee69cb603bd596 100644
--- a/scipost/mixins.py
+++ b/scipost/mixins.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/models.py b/scipost/models.py
index 8f11e1e0876434f96c22f5bad99e39ab722508be..e945aa6ee61ea6b389a6cb8ec91a45276cca4913 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -60,7 +60,7 @@ class Contributor(models.Model):
orcid_id = models.CharField(max_length=20, verbose_name="ORCID id",
blank=True, validators=[orcid_validator])
address = models.CharField(max_length=1000, verbose_name="address", blank=True)
- personalwebpage = models.URLField(verbose_name='personal web page', blank=True)
+ personalwebpage = models.URLField(max_length=300, verbose_name='personal web page', blank=True)
vetted_by = models.ForeignKey('self', on_delete=models.SET(get_sentinel_user),
related_name="contrib_vetted_by", blank=True, null=True)
accepts_SciPost_emails = models.BooleanField(
@@ -190,6 +190,7 @@ class Remark(models.Model):
class Meta:
default_related_name = 'remarks'
+ ordering = ['date']
def __str__(self):
return (self.contributor.user.first_name + ' '
diff --git a/scipost/paginator.py b/scipost/paginator.py
index 14cb0fb519c0cf1c5f329469b712b5c78fec3e1a..26eba263525692c0801e898c651f70f3145629ba 100644
--- a/scipost/paginator.py
+++ b/scipost/paginator.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/permissions.py b/scipost/permissions.py
index 65d3a751612e670be7537e23c06e328d91bd439a..11cc26596e807b46632bc9a262ca0ab50e5d2b7c 100644
--- a/scipost/permissions.py
+++ b/scipost/permissions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/services.py b/scipost/services.py
index dfb01269e9aeb28ab5761836478cdf1cadde1b85..29794a0ad8b30dfa446439e79ce1b54bd98e554c 100644
--- a/scipost/services.py
+++ b/scipost/services.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/signals.py b/scipost/signals.py
index d169108e790dd247a7ac450e4b7eaec1a2577229..9ae3e0db055f2533ea22eeaadfddc4eef288497e 100644
--- a/scipost/signals.py
+++ b/scipost/signals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/static/scipost/assets/css/_general.scss b/scipost/static/scipost/assets/css/_general.scss
index f23fad3cbc3ffdc7b6d0330e956bece0c45c5900..bbd1c458dccb781c1f39edc97bbb885b7e7c3c6c 100644
--- a/scipost/static/scipost/assets/css/_general.scss
+++ b/scipost/static/scipost/assets/css/_general.scss
@@ -30,13 +30,6 @@ footer {
a:hover {
color: $white;
}
-
- .logos a {
- width: 25%;
- display: inline-block;
- max-width: 100px;
- padding: 0 0.25rem;
- }
}
.quote-border {
diff --git a/scipost/static/scipost/assets/css/_homepage.scss b/scipost/static/scipost/assets/css/_homepage.scss
index 433a12ce0162ff96c8e595ee9ae22cd8f7a36333..e192129d7ed8bdc8074c4efd2ed6266918a94d92 100644
--- a/scipost/static/scipost/assets/css/_homepage.scss
+++ b/scipost/static/scipost/assets/css/_homepage.scss
@@ -31,3 +31,27 @@
border: 2px solid $scipost-orange;
border-radius: 3px;
}
+
+.homepage {
+ .logos a {
+ width: 25%;
+ display: inline-block;
+ max-width: 100px;
+ padding: 0 0.25rem;
+ }
+
+ .sponsors ul {
+ height: 100px !important;
+ list-style: none;
+
+ li {
+ height: 100px !important;
+
+ img {
+ max-height: 100px;
+ height: auto;
+ width: auto;
+ }
+ }
+ }
+}
diff --git a/scipost/storage.py b/scipost/storage.py
index bc4b065eb2b60af1f2f09c5af8727390641d3df4..c755aa8b4ddfecd7eb6f5faa467639b2d37496d8 100644
--- a/scipost/storage.py
+++ b/scipost/storage.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/tasks.py b/scipost/tasks.py
index 5222fb243528d593d2cf7a1878b7f92c910fb3f4..07104ede2b2ce76496fbf413322712a3cadbb098 100644
--- a/scipost/tasks.py
+++ b/scipost/tasks.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templates/partials/scipost/personal_page/editorial_actions.html b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
index 2271662f10137fe488cd6a4ca5deb2c133bde644..765cea4a0ea2570838fd5ccc191839149f907d3e 100644
--- a/scipost/templates/partials/scipost/personal_page/editorial_actions.html
+++ b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
@@ -86,11 +86,13 @@
{% endif %}
<div class="col-md-4">
- {% if perms.scipost.can_manage_college_composition %}
+ {% if perms.scipost.can_manage_college_composition or perms.scipost.can_view_potentialfellowship_list %}
<h3>Colleges and Fellowships</h3>
<ul>
- <li><a href="{% url 'colleges:potential_fellowships' %}">Manage Potential Fellowships</a></li>
+ <li><a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships: view{% if perms.scipost.can_manage_college_composition %} and manage{% endif %}</a></li>
+ {% if perms.scipost.can_manage_college_composition %}
<li><a href="{% url 'colleges:fellowships' %}">Manage Fellowships</a></li>
+ {% endif %}
</ul>
{% endif %}
diff --git a/scipost/templates/partials/scipost/personal_page/submissions.html b/scipost/templates/partials/scipost/personal_page/submissions.html
index 31d42257039ae868ebc5e9b919cd0ff708fde503..750c4b25191d4852fdf24c04041d5d36eaac9f84 100644
--- a/scipost/templates/partials/scipost/personal_page/submissions.html
+++ b/scipost/templates/partials/scipost/personal_page/submissions.html
@@ -28,14 +28,19 @@
{% include 'partials/submissions/submission_status.html' with submission=sub %}
{% if request.user.contributor == sub.submitted_by %}
- <p class="card-text mt-1">
- {% if sub.editor_in_charge %}
- <a href="{% url 'submissions:communication' sub.preprint.identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a>
- {% endif %}
- {% if sub.open_for_resubmission %}
- · <a href="{% url 'submissions:prefill_using_identifier' %}?identifier={{ sub.preprint.identifier_wo_vn_nr }}">Resubmit this manuscript</a>
- {% endif %}
- </p>
+ <p class="card-text mt-1">
+ <ul>
+ {% if sub.open_for_resubmission %}
+ <li>To resubmit, go to the <a href="{% url 'submissions:resubmit_manuscript' %}">resubmission page</a></li>
+ {% endif %}
+ {% if sub.under_consideration %}
+ {% if sub.editor_in_charge %}
+ <li><a href="{% url 'submissions:communication' sub.preprint.identifier_w_vn_nr 'AtoE' %}">Write to the Editor-in-charge</a></li>
+ {% endif %}
+ <li><a href="{% url 'submissions:withdraw_manuscript' sub.preprint.identifier_w_vn_nr %}"><span class="text-danger">Withdraw</span></a> (leads to confirmation page)</li>
+ {% endif %}
+ </ul>
+ </p>
{% endif %}
</div>
</li>
diff --git a/scipost/templates/scipost/EdCol_by-laws.html b/scipost/templates/scipost/EdCol_by-laws.html
index bb1526af60b4acb1a7029c85f7f17575546a011d..843fe4d42071807949376d635e2be87a9adee7f7 100644
--- a/scipost/templates/scipost/EdCol_by-laws.html
+++ b/scipost/templates/scipost/EdCol_by-laws.html
@@ -44,19 +44,22 @@
<li><strong>The Colleges</strong>
<p>
An Editorial College is formed for each field of the sciences in which SciPost
- carries out publishing activities. The Editorial College of a certain field takes
+ carries out publishing activities. The Editorial College of a certain field, composed of a collection of Fellows, takes end
responsibility for editorial matters for all Journals operating in that field.
- For interdisciplinary submissions, Fellows from distinct Colleges can be called
+ For interdisciplinary submissions, the services of Fellows from distinct Colleges can be called
upon during the evaluation process.
</p>
</li>
<li><strong>Eligibility</strong>
<p>
Fellows of an Editorial College must be professionally active academics
- with a position of at least associate professor level or equivalent
+ with a permanent position of at least associate professor level or equivalent
at a recognized university or research institute. They must possess an extensive
publication record demonstrating world-leading research capabilities in at least one
- stated subject area covered by SciPost Journals. There is no age limitation.
+ stated subject area covered by SciPost Journals falling under the Editorial College concerned. There is no age limitation.
+ </p>
+ <p>
+ <em>Guest Fellows</em>, whose services can be called upon for Commons- of Proceedings-class journals, should be professionally active academics with a position equivalent to junior faculty at a recognized university or research institute. The must possess a solid publication record demonstrating international-level research capabilities in at least one stated subject area covered by SciPost Journals falling under the Editorial College concerned. There is no age limitation. Guest Fellows are only given editorial tasks for specific submissions, and are not officially part of the Editorial College.
</p>
</li>
<li><strong>Number of Fellows</strong>
@@ -68,24 +71,29 @@
limited to approximately one half-day per month on average.
</p>
</li>
- <li><strong>Appointment by the Foundation</strong>
- <p>
- If the number of Fellows in a stated specialty is below the required minimum number,
- or if the number of currently available Fellows in a stated specialty
- has diminished to a level where processing of Submissions becomes delayed,
- the Foundation has the right to directly nominate and immediately appoint
- individuals deemed to fulfil the eligibility criteria.
- </p>
- </li>
- <li><strong>Appointment by election</strong>
- <p>
- Foundation board members, members of the Advisory Board as well as current and past
- Fellows of an Editorial College can nominate candidates for an Editorial Fellowship.
- In addition, guest Fellows which have proved to be reliable Editors-in-charge
- for <em>Commons</em>- or <em>Proceedings</em>-class Submissions can also be
- nominated by Editorial Administration on behalf of the Foundation.
- Candidates must fulfil the eligiblity criteria.
- </p>
+ <li><strong>Appointment</strong>
+ <p>SciPost's Editorial Colleges should be representative of their respective academic communities. They are meant to be self-sustaining in scale and composition.</p>
+ <ol>
+ <li>Direct appointment by the Foundation
+ <p>
+ If the number of Fellows in a stated specialty is below the required minimum number,
+ or if the number of currently available Fellows in a stated specialty
+ has diminished to a level where processing of Submissions becomes delayed,
+ the Foundation has the right to directly nominate and immediately appoint
+ individuals deemed to fulfil the eligibility criteria.
+ </p>
+ </li>
+ <li>Appointment by election
+ <p>
+ Foundation board members, members of the Advisory Board as well as current and past
+ Fellows of an Editorial College can nominate candidates for an Editorial Fellowship.
+ In addition, guest Fellows which have proved to be reliable Editors-in-charge
+ for <em>Commons</em>- or <em>Proceedings</em>-class Submissions can also be
+ nominated by Editorial Administration on behalf of the Foundation.
+ Candidates must fulfil the eligiblity criteria.
+ </p>
+ </li>
+ </ol>
<p>
These nominations shall be forwarded to the relevant Editorial College
for voting, at the latest at the next Virtual General Meeting.
@@ -100,7 +108,7 @@
</li>
<li><strong>Duration</strong>
<p>
- An appointment as Fellow of an Editorial College is for a duration of 2 years.
+ An appointment as Fellow of an Editorial College is in principle for a period of two years.
</p>
</li>
<li><strong>Visibility</strong>
@@ -224,7 +232,7 @@
<li>for <em>Commons</em>-class Journals, Editors-in-charge can
be preselected not only from current Fellows, but from well-respected members of the
community at large (in which case they become guest Fellows).</li>
- <li>for <em>Proceedings</em>-class Journals, Editoris-in-charge are normally
+ <li>for <em>Proceedings</em>-class Journals, Editors-in-charge are normally
preselected from the guest Fellows selected by the proceedings convenors
(in normal circumstances the conference/workshop organizers).</li>
</ul>
@@ -243,7 +251,7 @@
or <em>not interested</em>.
If the preselected list of Fellows empties and the submission has still not been
taken charge of, the preselection list is extended and new assignment requests
- are sent to different Fellow.
+ are sent to different Fellows.
If 5 assignments are declined citing <em>lack of interest</em>, the Submission is returned
to the authors and not considered for further processing towards publication.
</p>
@@ -257,45 +265,66 @@
</p>
</li>
<li><strong>Appointment of Editor-in-charge</strong>
- <p>The first Fellow of the Editorial College
- (or, for <em>Commons</em>- or <em>Proceedings</em>-class Journals, guest Fellow)
- who accepts an assignment,
- or who volunteers while perusing the pool, becomes Editor-in-charge of the Submission,
- under the conditions that:
- <ol>
- <li>the Submission's main specialty matches one of the Fellow's stated specialties</li>
- <li>there is no conflict of interest of any form between the Fellow and any of the Submission's authors</li>
- <li>there is no personal or hierarchical relationship between the Fellow and any of the Submission's authors</li>
- <li>the Fellow has not co-authored a paper with any of the Submission's authors in the last 5 years.</li>
- </ol>
- It is the responsibility of the Fellow to ensure that these conditions are met.</p>
- <p>Upon appointment of the Editor-in-charge, the online Submission Page is automatically
- created and opened for contributed Reports and Comments, and the Editor-in-charge is required to
- immediately open a refereeing round.
- </p>
+ <ol>
+ <li>First appointment
+ <p>The first Fellow of the Editorial College
+ (or, for <em>Commons</em>- or <em>Proceedings</em>-class Journals, guest Fellow)
+ who accepts an assignment,
+ or who volunteers while perusing the pool, becomes Editor-in-charge of the Submission,
+ under the conditions that:
+ <ul>
+ <li>the Submission's main specialty matches one of the Fellow's stated specialties</li>
+ <li>there is no conflict of interest of any form between the Fellow and any of the Submission's authors</li>
+ <li>there is no personal or hierarchical relationship between the Fellow and any of the Submission's authors</li>
+ <li>the Fellow has not co-authored a paper with any of the Submission's authors in the last 5 years.</li>
+ </ul>
+ <br/>
+ It is the responsibility of the Fellow to ensure that these conditions are met.</p>
+ </li>
+ <li>Reappointment
+ <p>In the case of a Resubmission, the original Submission's Editor-in-charge is
+ automatically appointed as Editor-in-charge for the Resubmission.</p>
+ <li>Replacement of the Editor-in-charge
+ <p>Upon explicit request by the Editor-in-charge, or in circumstances in which the editorial processing of a given
+ Submission is suffering from unreasonable delays, the Editorial Administration
+ reserves the right to seek a replacement for Editor-in-charge of that Submission.</p>
+ </li>
+ </ol>
</li>
<li><strong>Refereeing rounds</strong>
<ol>
+ <li>Choice of refereeing cycle
+ <p>
+ Upon appointment, the Editor-in-charge can choose one of the following cycles:
+ <ul>
+ <li>default refereeing cycle</li>
+ <li>short refereeing cycle</li>
+ <li>direct Editorial Recommendation</li>
+ </ul>
+ </p>
+ <p>
+ For first-time submission, the choice is between the default refereeing cycle, or the direct Editorial Recommendation. For resubmission, all three choices are available, the short cycle being meant for rapid re-consultation of referees from previous rounds. Upon choosing either the direct or short refereeing cycles, the online Submission Page is automatically created and opened for contributed Reports and Comments, and the Editor-in-charge is required to immediately open a refereeing round.
+ </p>
+ </li>
<li>Opening
- <p>Upon appointment of the Editor-in-charge, or resubmission after a major revision,
- a refereeing round must be opened.
- At least 3 referees must be invited to provide a Report.
+ <p>For the default or short cycles,
+ a refereeing round must be opened. For a default refereeing cycle,
+ at least 3 referees must be invited to provide a Report. For the short cycle (meant for resubmissions), at least one of the previous referees must be reinvited.
Referees can accept or decline the invitation; if a referee declines or fails to commit
within 5 working days, the Editor-in-charge must seek an alternative referee.
</p>
</li>
<li>Duration
- <p>The indicated duration of a refereeing round is 4 weeks for normal papers and 8 weeks for Lecture Notes,
- counted from the moment one of the invited referees first accepts to provide a report.
+ <p>The indicated duration of a refereeing round in the default cycle is 4 weeks for normal papers and 8 weeks for Lecture Notes,
+ counted from the moment one of the invited referees first accepts to provide a report. For the short cycle, the duration is 2 weeks.
Referees will automatically be sent reminders of impending deadlines.
</p>
</li>
<li>Access to identities
<p>Besides the invited Reports, contributed Reports and Comments can also be provided by
- registered Contributors. Although anonymity can be requested by the Contributor upon
- submission of a contributed Report, this implements anonymity on the public interface only: the
- identity of the authors of all contributed Reports are accessible to the Editor-in-charge of
- the Submission. It is forbidden for the Editor-in-charge to reveal those identities in any
+ registered Contributors. Although anonymity can be requested by the Contributor, this implements anonymity on the public interface only: the
+ identity of the authors of all contributed material is accessible to Editorial Administration and to the Editor-in-charge of
+ the Submission. It is forbidden for them to reveal those identities in any
way, except to non-conflicted members of the Editorial College or of the Advisory Board if it is deemed
necessary.</p>
</li>
@@ -306,7 +335,8 @@
<a href="{% url 'journals:journals_terms_and_conditions' %}#referee_obligations">referee obligations</a>.
Similarly, the Editor-in-charge must verify that the authors of contributed Reports and Comments
also fulfil these conditions (this occurring during vetting of the Report). If in doubt, the Editor-in-charge
- must disregard the Reports and Comments in question when formulating the Editorial Recommendation.</p>
+ must disregard the Reports and Comments in question when formulating the Editorial Recommendation.
+ The Editorial Administration monitors the correctness of the implementation of these conditions.</p>
</li>
<li>Closing and author reponse
<p>At the end of the stated duration, submission of Reports on the Submission Page is deactivated.
@@ -374,7 +404,12 @@
Editorial College.
After being formulated by the Editor-in-charge, the Editorial Recommendation
is made visible to all non-conflicted Fellows.
- At this point, the recommendation can be one of these possibilities:
+ </p>
+ <p>
+ A number of Fellows (depending on the recommentation, see below) is selected by Editorial Administration and specifically given voting rights on the Recommendation. This selection is made to ensure sufficient expertise, enforce checks on impartiality and avoid conflicts of interest. Other qualified Fellows can claim voting rights on the Recommendation if they so wish, by contacting Editorial Administration (in the interest of workflow control, not all Fellows are expected to vote on all Recommendations, but rather only on the ones they are given voting rights on).
+ </p>
+ <p>
+ At this point, the Recommendation can be one of these possibilities:
</p>
<ul>
<li>(for submissions to field-leading titles only) Publication as Select</li>
@@ -383,6 +418,7 @@
<li>Rejection.</li>
</ul>
<br/>
+ <p>The precise voting protocol depends on the Recommendation:</p>
<ol>
<li><strong>Publication as Select</strong>
<p>
@@ -395,7 +431,8 @@
with any of the authors. The Editor-in-charge by definition supports this promotion
to Select and does not need to vote;
other Fellows are asked to agree, abstain or disagree with the recommendation
- to publish as Select. The Submission is promoted to Select if either:
+ to publish as Select. Editorial Administration initiates the vote by giving 9 specialist
+ and 6 further same-discipline Fellows voting rights. The Submission is promoted to Select if either:
</p>
<ul>
<li>specialist Fellows unanimously agree</li>
@@ -415,12 +452,13 @@
<p>
If the editorial recommendation is to publish the paper, Fellows with expertises
corresponding to those of the Submission can vote to agree, abstain or disagree with
- publication. The Submission is accepted if:
+ publication. Editorial Administration initiates the vote by giving 9 specialist Fellows voting rights. The Submission is accepted if:
</p>
- <ol>
+ <ul>
<li>at least 4 specialist Fellows agree and none disagree</li>
- <li>a majority of all specialist Fellows agrees.</li>
- </ol>
+ <li>a majority of specialist Fellows agrees.</li>
+ </ul>
+ <br/>
<p>
Upon acceptance, the authors are informed and the paper is immediately
forwarded to Production.
@@ -443,7 +481,7 @@
<li><strong>Rejection</strong>
<p>
If the editorial recommendation is to reject the paper, specialist Fellows are asked
- to agree, abstain, or veto the recommendation.
+ to agree, abstain, or veto the recommendation. Editorial Administration initiates the vote by giving 9 specialist Fellows voting rights.
</p>
<p>
If a majority of specialist
diff --git a/scipost/templates/scipost/_remark_li.html b/scipost/templates/scipost/_remark_li.html
index bf4fc637bfa4e178de1615f9d492a0681fd8cc4f..d8d0494ba6437c62fcf4366490db0f4a5a1a7375 100644
--- a/scipost/templates/scipost/_remark_li.html
+++ b/scipost/templates/scipost/_remark_li.html
@@ -2,5 +2,9 @@
<div class="font-weight-bold">
{{remark.contributor.user.first_name}} {{remark.contributor.user.last_name}} <small class="text-muted">on {{remark.date}}</small>
</div>
+ {% if remark.contributor.user.is_superuser %}
+ <div>{{remark.remark|safe|linebreaks}}</div>
+ {% else %}
<div>{{remark.remark|linebreaks}}</div>
+ {% endif %}
</li>
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index 968c25729fd5c21b2887bb0a2f83d319f347d7de..d9af34567e6038d97b5120744c1209fe1cb58d7b 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -25,7 +25,7 @@
</li>
{% endfor %}
</ul>
- <p class="mb-3 px-3"><a href="{% url 'journals:publications' %}">View all Publications.</a></p>
+ <p class="mb-3 px-3"><a href="{% url 'journals:publications' %}">View all Publications</a></p>
</div><!-- End latest publications -->
</div>
@@ -43,7 +43,7 @@
</li>
{% endfor %}
</ul>
- <p class="mb-3 px-3"><a href="{% url 'submissions:submissions' %}">View all Submissions.</a></p>
+ <p class="mb-3 px-3"><a href="{% url 'submissions:submissions' %}">View all Submissions</a></p>
</div><!-- End latest submissions -->
</div>
</div>
@@ -55,11 +55,12 @@
{% endblock %}
{% block content_footer %}
- <footer class="container-fluid text-left secondary pt-4 mt-5">
+ <div class="container-fluid text-left secondary pt-4 mt-5 border-top border-primary">
<div class="row">
<div class="col-lg-6">
- <h1>Sponsors <a class="mb-2 d-inline-block" href="{% url 'sponsors:sponsors' %}"><small class="text-muted">[see all]</small></a></h1>
- <div class="sponsors">
+ <h1>Sponsors</h1>
+ <a href="{% url 'sponsors:sponsors' %}">See all sponsors</a>
+ <div class="sponsors mt-3">
<ul id="fader">
{% for sponsor in current_sponsors %}
{% if sponsor.logo %}
@@ -77,8 +78,8 @@
<a href="//www.doaj.org" target="_blank"><img src="{% static 'scipost/images/doaj_logo_200.jpg' %}" width="90" alt="DOAJ logo"></a>
<a href="//www.clockss.org" target="_blank"><img src="{% static 'scipost/images/clockss_original_logo_boxed_ai-cropped-90.png' %}" width="80" alt="Clockss logo"></a>
<a href="//i4oc.org/" target="_blank"><img width="100" src="{% static 'scipost/images/I4OC.png' %}"></a>
- <a href="//freejournals.org" target="_blank"><img width="100" src="{% static 'scipost/images/FJN-logo-long.png' %}"></a>
+ <a href="//freejournals.org" target="_blank"><img width="100" src="{% static 'scipost/images/FJN-logo-long.png' %}"></a>
</div>
- </div>
- </footer>
+ </div>
+ </div>
{% endblock %}
diff --git a/scipost/templates/scipost/sitemap.xml b/scipost/templates/scipost/sitemap.xml
index 98d2c9a4e00d88f9398e87ca11312a7ab8c22054..0756cad4d55af689cedae1ee144c59578fdbf574 100644
--- a/scipost/templates/scipost/sitemap.xml
+++ b/scipost/templates/scipost/sitemap.xml
@@ -6,7 +6,7 @@
<url><loc>https://scipost.org/finances/subsidies</loc></url>
{% for newsitem in newsitems %}
- <url><loc>https://scipost.org{{ newsitem.get_absolute_url }}</locL</url>
+ <url><loc>https://scipost.org{{ newsitem.get_absolute_url }}>/locL>/url>
{% endfor %}
{% for journal in journals %}
diff --git a/scipost/templatetags/add_get_parameters.py b/scipost/templatetags/add_get_parameters.py
index fa87ca3eacd08eaa485b3d1715c982d203ea3070..4be065cd964247f14143b36e8bef3039113efc09 100644
--- a/scipost/templatetags/add_get_parameters.py
+++ b/scipost/templatetags/add_get_parameters.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templatetags/bootstrap.py b/scipost/templatetags/bootstrap.py
index 6ba02b0928c1054e6f2c423adb22991f6289d440..b46340009da603e79031a9992f2c922fc8c7aff6 100644
--- a/scipost/templatetags/bootstrap.py
+++ b/scipost/templatetags/bootstrap.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templatetags/extra_form_widgets.py b/scipost/templatetags/extra_form_widgets.py
index 7f1aaa0ba67dd761e20b6f4d6e34b915b8ea3111..a47965384f773cfef63b285a7486c197bd969c3a 100644
--- a/scipost/templatetags/extra_form_widgets.py
+++ b/scipost/templatetags/extra_form_widgets.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templatetags/filename.py b/scipost/templatetags/filename.py
index 9c00630cc7f30455638971e4e285b6785a705757..0b1dd78d9525da81c0a20bb411346d20f35646c0 100644
--- a/scipost/templatetags/filename.py
+++ b/scipost/templatetags/filename.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templatetags/request_filters.py b/scipost/templatetags/request_filters.py
index 7a8461a3f3e0bafe2406752075d1acc5b27d68cd..1f65917f634ac8288c905fcf8728367a94dd33cf 100644
--- a/scipost/templatetags/request_filters.py
+++ b/scipost/templatetags/request_filters.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templatetags/scipost_extras.py b/scipost/templatetags/scipost_extras.py
index 6fce7867974212819647a41b4049ddc94f31a19c..77c267bab0d4a5303e789cfa908aeb7d4b87e22e 100644
--- a/scipost/templatetags/scipost_extras.py
+++ b/scipost/templatetags/scipost_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templatetags/texfilters.py b/scipost/templatetags/texfilters.py
index c75d8219cb22366fe3c91fac93e7fb637518ebb5..41e107f5acb342f7e79772e3463bb5b7c038e481 100644
--- a/scipost/templatetags/texfilters.py
+++ b/scipost/templatetags/texfilters.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/templatetags/user_groups.py b/scipost/templatetags/user_groups.py
index 5cc738412825fe49dfcf7cec3f04767f7de854ea..1d97a093daa42bd067012b6ed92f6a2cf6c2ff4d 100644
--- a/scipost/templatetags/user_groups.py
+++ b/scipost/templatetags/user_groups.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/test_services.py b/scipost/test_services.py
index fed6fb9aa1d044b6a2207ba1fe4657b98200664e..52e05f85d0deb16030ce2ab56545616309bc33ab 100644
--- a/scipost/test_services.py
+++ b/scipost/test_services.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/test_views.py b/scipost/test_views.py
index 5c3f5e92824fdd9c59b82c055ba51935c36dc567..c8cc01ce5c31a80f3a40997cfb7d792dbca47ecf 100644
--- a/scipost/test_views.py
+++ b/scipost/test_views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/tests.py b/scipost/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/scipost/tests.py
+++ b/scipost/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/urls.py b/scipost/urls.py
index bf8b31a84836303c92a879faac47137e18af328e..e55959677268bccbc24b2eeea22222b7e84aff5a 100644
--- a/scipost/urls.py
+++ b/scipost/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/utils.py b/scipost/utils.py
index 61b8d05fc96f7217d0aa347fd2b4a4e3238b7e71..c75cc80e0824ab27d9c2e840861f60cb2cabfb32 100644
--- a/scipost/utils.py
+++ b/scipost/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/scipost/views.py b/scipost/views.py
index 9159ae59caf960e4acff15f65e27c1b910cda34a..30f2bcf017aa4a107024dc09f790be1305989594 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -131,10 +131,11 @@ def index(request):
def protected_serve(request, path, show_indexes=False):
- """Serve media files from outside the public MEDIA_ROOT folder.
+ """
+ Serve media files from outside the public MEDIA_ROOT folder.
Serve files that are saved outside the default MEDIA_ROOT folder for superusers only!
- This will be usefull eg. in the admin pages.
+ This will be useful eg. in the admin pages.
"""
if not request.user.is_authenticated or not request.user.is_superuser:
# Only superusers may get to see secure files without an explicit serve method!
diff --git a/scipost/widgets.py b/scipost/widgets.py
index 45cc00630bc22ebc04ca4a7533e69a9c8d054be3..25607c060719190f4617ba5ede1109b939bce913 100644
--- a/scipost/widgets.py
+++ b/scipost/widgets.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
import json
diff --git a/sponsors/templates/sponsors/_sponsor_card.html b/sponsors/templates/sponsors/_sponsor_card.html
index fdd04b43a960c16c9f5d749f10e4b87851ac31a0..afc41549fac14ffbe1053ebd2dc9a858bd2e5057 100644
--- a/sponsors/templates/sponsors/_sponsor_card.html
+++ b/sponsors/templates/sponsors/_sponsor_card.html
@@ -1,6 +1,8 @@
-<div class="card">
- <img class="card-img-top {{ sponsor.css_class }} p-2" src="{% if sponsor.logo %}{{ sponsor.logo.url }}{% endif %}" alt="{{ sponsor.name }} logo">
- <div class="card-body bg-light">
+<div class="card text-center">
+ {% if sponsor.logo %}
+ <img class="card-img-top {{ sponsor.css_class }} p-2" style="max-height: 16rem; max-width: 16rem;" src="{% if sponsor.logo %}{{ sponsor.logo.url }}{% endif %}" alt="{{ sponsor.name }} logo">
+ {% endif %}
+ <div class="card-body bg-light text-left">
<h4 class="card-title">
{% if sponsor.name_original %}{{ sponsor.name_original }}{% else %}{{ sponsor.name }}{% endif %}</h4>
{% if sponsor.name_original %}
diff --git a/sponsors/templates/sponsors/base.html b/sponsors/templates/sponsors/base.html
index 8e7667e051ced72d6abd899987dd6d3158ba03ad..34520caa9c195b1cdf94d19cef3759dd9eab48c0 100644
--- a/sponsors/templates/sponsors/base.html
+++ b/sponsors/templates/sponsors/base.html
@@ -3,7 +3,7 @@
{% block body_class %}{{ block.super }} sponsors{% endblock %}
{% block breadcrumb %}
- <div class="container-outside header">
+ <div class="breadcrumb-container">
<div class="container">
<nav class="breadcrumb hidden-sm-down">
{% block breadcrumb_items %}
diff --git a/sponsors/urls.py b/sponsors/urls.py
index a9ca651a6d10a99e5f9a7aee527a35353cec877d..dfe636da7261e3a934e168c117f05c012a26e7ee 100644
--- a/sponsors/urls.py
+++ b/sponsors/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/sponsors/views.py b/sponsors/views.py
index 1d7a6a7fa4416bd958321113cd8e8c89c18a8a0f..204ba5f0597daa737e77de92fb2599ba4cc537d8 100644
--- a/sponsors/views.py
+++ b/sponsors/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/stats/admin.py b/stats/admin.py
index 7369721f25ab135cebb50385897ad2f9b4265d26..05b4ce08c7d593d4ed7b4418017c0d8736e57c12 100644
--- a/stats/admin.py
+++ b/stats/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/stats/apps.py b/stats/apps.py
index bccdfc081919b84e761b3f8232a1640b66ffffa3..71c2eef0b64cba7bbf4c4b41466d882353c1fbde 100644
--- a/stats/apps.py
+++ b/stats/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/stats/models.py b/stats/models.py
index b34b93c2a0f6de3dfc117c2f0947e2ab8143af7a..6df45157bd0d9c823ccdc8b4cb48772206952be4 100644
--- a/stats/models.py
+++ b/stats/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/stats/templatetags/stats_extras.py b/stats/templatetags/stats_extras.py
index a082946e1cbc50f43dbb901c9f3824cde53d568e..ca7b6c878f884bf654f5649f53b26cd6c38cb7c0 100644
--- a/stats/templatetags/stats_extras.py
+++ b/stats/templatetags/stats_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/stats/tests.py b/stats/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/stats/tests.py
+++ b/stats/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/stats/urls.py b/stats/urls.py
index 7024875212ec6668d717cb5e70f38b3d0a449dd4..d1e157b65d9e0d39cc39c397d557986bf77449b5 100644
--- a/stats/urls.py
+++ b/stats/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/stats/views.py b/stats/views.py
index f9ccf9ceead3cfba8c012f0e5080756e62fe7f72..2eb2c72bc2706bfb2af421304e167ba3b7d3023d 100644
--- a/stats/views.py
+++ b/stats/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/strings/__init__.py b/strings/__init__.py
index 998a181fbfb946b295405959ea7f108fa08f4e20..34d853250137d7218abe0b9d651fcbe905643382 100644
--- a/strings/__init__.py
+++ b/strings/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/__init__.py b/submissions/__init__.py
index 9aabdc60bf649596e79a00cbf3a8df700725e17b..6b57bd1973282050fbfa762807b91122a106105d 100644
--- a/submissions/__init__.py
+++ b/submissions/__init__.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/admin.py b/submissions/admin.py
index 4535d7767c20f104f586128b6a730318a496158b..aea1bbaebcf6344e6684659482892ba7dd0f569d 100644
--- a/submissions/admin.py
+++ b/submissions/admin.py
@@ -1,8 +1,9 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
from django.contrib import admin
+from django.db.models import Q
from django import forms
from guardian.admin import GuardedModelAdmin
@@ -48,7 +49,8 @@ class SubmissionAdmin(GuardedModelAdmin):
date_hierarchy = 'submission_date'
form = SubmissionAdminForm
list_display = ('title', 'author_list', 'submitted_to',
- 'status', 'submission_date', 'publication')
+ 'status', 'visible_public', 'visible_pool', 'refereeing_cycle',
+ 'submission_date', 'publication')
list_filter = ('status', 'discipline', 'submission_type', 'submitted_to')
search_fields = ['submitted_by__user__last_name', 'title', 'author_list', 'abstract']
raw_id_fields = ('editor_in_charge', 'submitted_by')
@@ -209,23 +211,27 @@ class EICRecommendationAdminForm(forms.ModelForm):
eligible_to_vote = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter(
- user__groups__name__in=['Editorial College'],
- ).order_by('user__last_name'))
+ Q(user__groups__name__in=['Editorial College']) |
+ Q(fellowships__isnull=False),
+ ).distinct().order_by('user__last_name'))
voted_for = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter(
- user__groups__name__in=['Editorial College'],
- ).order_by('user__last_name'))
+ Q(user__groups__name__in=['Editorial College']) |
+ Q(fellowships__isnull=False),
+ ).distinct().order_by('user__last_name'))
voted_against = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter(
- user__groups__name__in=['Editorial College'],
- ).order_by('user__last_name'))
+ Q(user__groups__name__in=['Editorial College']) |
+ Q(fellowships__isnull=False),
+ ).distinct().order_by('user__last_name'))
voted_abstain = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter(
- user__groups__name__in=['Editorial College'],
- ).order_by('user__last_name'))
+ Q(user__groups__name__in=['Editorial College']) |
+ Q(fellowships__isnull=False),
+ ).distinct().order_by('user__last_name'))
class Meta:
model = EICRecommendation
diff --git a/submissions/apps.py b/submissions/apps.py
index 52b874cf9bddd0f8c11f7f17a8ce3dac699cdcab..5ebde79594a612c4aefe60d1b10395f7cfa471f2 100644
--- a/submissions/apps.py
+++ b/submissions/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/behaviors.py b/submissions/behaviors.py
index bbb5c9e32a574395691e9b5bb1084704b33e8cf0..0b087dd7951d80bfe42f1ee9aeddbae2ddfef15c 100644
--- a/submissions/behaviors.py
+++ b/submissions/behaviors.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/constants.py b/submissions/constants.py
index 3845028dc260c38a292a4555a0f4b1c64b54081d..ada257fc762ebb710508ae0a3779a2095a2d592b 100644
--- a/submissions/constants.py
+++ b/submissions/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -36,6 +36,11 @@ SUBMISSION_STATUS = (
(STATUS_PUBLISHED, 'Published'),
)
+# Submissions which are currently under consideration
+SUBMISSION_UNDER_CONSIDERATION = [
+ STATUS_INCOMING, STATUS_UNASSIGNED, STATUS_EIC_ASSIGNED, STATUS_RESUBMITTED
+]
+
# Submissions with these statuses never have required actions.
NO_REQUIRED_ACTION_STATUSES = [
STATUS_UNASSIGNED,
diff --git a/submissions/exceptions.py b/submissions/exceptions.py
index 49896315d1c347497a2116486228d1b9f7f16530..1349a3c6769337ec18faf21e9700793538cc6f17 100644
--- a/submissions/exceptions.py
+++ b/submissions/exceptions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/factories.py b/submissions/factories.py
index 64afff7b448b0890b0d840f4765bd93851bc8fc2..ceb5c664bdc11326bee5aef059db30abe2efa214 100644
--- a/submissions/factories.py
+++ b/submissions/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/forms.py b/submissions/forms.py
index 502d32f70adbe8a57da26a3538d3c44d32d36207..375bddf4e9fb5ef27a28eb9323154b5e73484dae 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -21,7 +21,7 @@ from .constants import (
SUBMISSION_CYCLE_CHOICES, REPORT_PUBLISH_1, REPORT_PUBLISH_2, REPORT_PUBLISH_3, STATUS_VETTED,
REPORT_MINOR_REV, REPORT_MAJOR_REV, REPORT_REJECT, DECISION_FIXED, DEPRECATED, STATUS_COMPLETED,
STATUS_EIC_ASSIGNED, CYCLE_DEFAULT, CYCLE_DIRECT_REC, STATUS_PREASSIGNED, STATUS_REPLACED,
- STATUS_FAILED_PRESCREENING, STATUS_DEPRECATED, STATUS_ACCEPTED, STATUS_DECLINED)
+ STATUS_FAILED_PRESCREENING, STATUS_DEPRECATED, STATUS_ACCEPTED, STATUS_DECLINED, STATUS_WITHDRAWN)
from . import exceptions, helpers
from .helpers import to_ascii_only
from .models import (
@@ -783,8 +783,43 @@ class SubmissionPrescreeningForm(forms.ModelForm):
if self.cleaned_data['message_for_authors']:
pass
- # TODO: Send mail now.
+class WithdrawSubmissionForm(forms.ModelForm):
+ """
+ A submitting author has the right to withdraw the manuscript.
+ """
+
+ confirm = forms.ChoiceField(
+ widget=forms.RadioSelect, choices=((True, 'Confirm'), (False, 'Abort')), label='')
+
+ def __init__(self, *args, **kwargs):
+ """Add related submission as argument."""
+ self.submission = kwargs.pop('submission')
+ super().__init__(*args, **kwargs)
+
+ def is_confirmed(self):
+ return self.cleaned_data.get('confirm') in (True, 'True')
+
+ def save(self):
+ if self.is_confirmed():
+ # Update submission (current + any previous versions)
+ Submission.objects.filter(id=self.instance.id).update(
+ visible_public=False, visible_pool=False,
+ open_for_commenting=False, open_for_reporting=False,
+ status=STATUS_WITHDRAWN, latest_activity=timezone.now())
+ self.instance.get_other_versions().update(visible_public=False)
+
+ # Update all assignments
+ EditorialAssignment.objects.filter(submission=self.instance).need_response().update(
+ status=STATUS_DEPRECATED)
+ EditorialAssignment.objects.filter(submission=self.instance).accepted().update(
+ status=STATUS_COMPLETED)
+
+ # Deprecate any outstanding recommendations
+ EICRecommendation.objects.filter(submission=self.instance).active().update(
+ status=DEPRECATED)
+ self.instance.refresh_from_db()
+ return self.instance
######################
# Editorial workflow #
@@ -953,7 +988,7 @@ class VotingEligibilityForm(forms.ModelForm):
fields = ()
def __init__(self, *args, **kwargs):
- """Get queryset of Contributors eligibile for voting."""
+ """Get queryset of Contributors eligible for voting."""
super().__init__(*args, **kwargs)
secondary_areas = self.instance.submission.secondary_areas
if not secondary_areas:
diff --git a/submissions/helpers.py b/submissions/helpers.py
index b9cac5c9b25be45f47de78637c9c06c48883b2a0..8d648386a61266c5aa820be56e00616642ab23ee 100644
--- a/submissions/helpers.py
+++ b/submissions/helpers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/management/commands/create_submissions.py b/submissions/management/commands/create_submissions.py
index 602cce2f2ef29cd1f89f8f7dcf69aa1a944d6b56..0630533c8bd11ed58ff946d9e5d2e5a5e4a288dc 100644
--- a/submissions/management/commands/create_submissions.py
+++ b/submissions/management/commands/create_submissions.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/management/commands/email_fellows_tasklist.py b/submissions/management/commands/email_fellows_tasklist.py
index 7dc820de2b943640e1c7ad47eaf0079fb31157c1..26d8697962bede2977b835498ba39aed87156a1b 100644
--- a/submissions/management/commands/email_fellows_tasklist.py
+++ b/submissions/management/commands/email_fellows_tasklist.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -6,6 +6,7 @@ from django.core.management import BaseCommand
from ...models import EICRecommendation
+from colleges.models import PotentialFellowship
from mails.utils import DirectMailUtil
from scipost.models import Contributor
@@ -20,6 +21,7 @@ class Command(BaseCommand):
count = 0
for fellow in fellows:
+ nr_potfels_to_vote_on = PotentialFellowship.objects.to_vote_on(fellow).count()
recs_to_vote_on = EICRecommendation.objects.user_must_vote_on(fellow.user)
assignments_ongoing = fellow.editorial_assignments.ongoing()
assignments_to_consider = fellow.editorial_assignments.invited()
@@ -28,6 +30,7 @@ class Command(BaseCommand):
mail_sender = DirectMailUtil(
mail_code='fellows/email_fellow_tasklist',
fellow=fellow,
+ nr_potfels_to_vote_on=nr_potfels_to_vote_on,
recs_to_vote_on=recs_to_vote_on,
assignments_ongoing=assignments_ongoing,
assignments_to_consider=assignments_to_consider,
diff --git a/submissions/management/commands/remind_fellows_to_submit_report.py b/submissions/management/commands/remind_fellows_to_submit_report.py
index c2a56364569360ebe41d99bc5e34e10122edb217..592e76b78b17f1216963eac2949aa60e2c4da307 100644
--- a/submissions/management/commands/remind_fellows_to_submit_report.py
+++ b/submissions/management/commands/remind_fellows_to_submit_report.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/management/commands/send_refereeing_reminders.py b/submissions/management/commands/send_refereeing_reminders.py
index 6a16667aa47ff4e6f07eacf9bdaaf362b1544227..18bca811318a10430c8a35107c71eb3c9c1e379e 100644
--- a/submissions/management/commands/send_refereeing_reminders.py
+++ b/submissions/management/commands/send_refereeing_reminders.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/managers.py b/submissions/managers.py
index 7c5a7cbf0f8ccec92840c4122bd2fb315fbb1976..d3f1adc904693965189088d94a50975e84d4b7ce 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -219,10 +219,8 @@ class SubmissionQuerySet(models.QuerySet):
return self.none()
return self.filter(is_current=True, status__in=[
- constants.STATUS_INCOMING,
- constants.STATUS_UNASSIGNED,
- constants.STATUS_EIC_ASSIGNED,
- ], submitted_by=user.contributor)
+ constants.STATUS_INCOMING, constants.STATUS_UNASSIGNED, constants.STATUS_EIC_ASSIGNED,
+ ], authors=user.contributor)
class SubmissionEventQuerySet(models.QuerySet):
@@ -425,6 +423,12 @@ class RefereeInvitationQuerySet(models.QuerySet):
"""Filter invitations declined by referee."""
return self.filter(accepted=False)
+ def open(self): # WRONG: pending already filters for cancelled=False
+ return self.pending().filter(cancelled=False)
+
+ def outstanding(self):
+ return self.filter(cancelled=False).exclude(accepted=False).exclude(fulfilled=True)
+
def in_process(self):
"""Filter invitations (non-cancelled) accepted by referee that are not fulfilled."""
return self.accepted().filter(fulfilled=False, cancelled=False)
diff --git a/submissions/migrations/0051_auto_20190126_2058.py b/submissions/migrations/0051_auto_20190126_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..cecbc9a868f1188c09a86f1f69a415ff3049e5d6
--- /dev/null
+++ b/submissions/migrations/0051_auto_20190126_2058.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import scipost.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0050_auto_20181219_0825'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='secondary_areas',
+ field=scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], max_length=10), blank=True, null=True, size=None),
+ ),
+ migrations.AlterField(
+ model_name='submission',
+ name='subject_area',
+ field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], default='Phys:QP', max_length=10, verbose_name='Primary subject area'),
+ ),
+ ]
diff --git a/submissions/mixins.py b/submissions/mixins.py
index 78cb50aa374cdc9426baabe3d53e89e5c911a1a5..1c6eb19d2bd61f06ae1b0445732cb64dc72d2e17 100644
--- a/submissions/mixins.py
+++ b/submissions/mixins.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/models.py b/submissions/models.py
index 581cff18f76398ac4e406404aa359af9d2b3dd3d..8c3c042339926823181d9f04b224c9cc34ce8bb6 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -18,7 +18,8 @@ from .behaviors import SubmissionRelatedObjectMixin
from .constants import (
ASSIGNMENT_REFUSAL_REASONS, ASSIGNMENT_NULLBOOL, SUBMISSION_TYPE, STATUS_PREASSIGNED,
ED_COMM_CHOICES, REFEREE_QUALIFICATION, QUALITY_SPEC, RANKING_CHOICES, STATUS_INVITED,
- SUBMISSION_STATUS, REPORT_STATUSES, STATUS_UNVETTED, STATUS_INCOMING, STATUS_EIC_ASSIGNED,
+ SUBMISSION_STATUS, SUBMISSION_UNDER_CONSIDERATION,
+ REPORT_STATUSES, STATUS_UNVETTED, STATUS_INCOMING, STATUS_EIC_ASSIGNED,
SUBMISSION_CYCLES, CYCLE_DEFAULT, CYCLE_SHORT, DECISION_FIXED, ASSIGNMENT_STATUSES,
CYCLE_DIRECT_REC, EVENT_GENERAL, EVENT_TYPES, EVENT_FOR_AUTHOR, EVENT_FOR_EIC, REPORT_TYPES,
REPORT_NORMAL, STATUS_DRAFT, STATUS_VETTED, EIC_REC_STATUSES, VOTING_IN_PREP, STATUS_UNASSIGNED,
@@ -78,8 +79,7 @@ class Submission(models.Model):
is_current = models.BooleanField(default=True)
visible_public = models.BooleanField("Is publicly visible", default=False)
visible_pool = models.BooleanField("Is visible in the Pool", default=False)
- is_resubmission_of = models.ForeignKey(
- 'self', blank=True, null=True, related_name='successor')
+ is_resubmission_of = models.ForeignKey('self', blank=True, null=True, related_name='successor')
thread_hash = models.UUIDField(default=uuid.uuid4)
_is_resubmission = models.BooleanField(default=False)
refereeing_cycle = models.CharField(
@@ -222,6 +222,14 @@ class Submission(models.Model):
"""Check if Submission has fixed EICRecommendation asking for revision."""
return self.eicrecommendations.fixed().asking_revision().exists()
+ @property
+ def under_consideration(self):
+ """
+ Check if the Submission is currently under consideration
+ (in other words: is undergoing editorial processing).
+ """
+ return self.status in SUBMISSION_UNDER_CONSIDERATION
+
@property
def open_for_resubmission(self):
"""Check if Submission has fixed EICRecommendation asking for revision."""
diff --git a/submissions/plagiarism.py b/submissions/plagiarism.py
index c4f0bcfffbb9e3f0c5a06ca2c8175640daa42305..9ed5ea933a1710d8aeaf733cfd2575e815e08cad 100644
--- a/submissions/plagiarism.py
+++ b/submissions/plagiarism.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/search_indexes.py b/submissions/search_indexes.py
index 80f1cd4ad361278cd48e4fcfd767b3325f3d80e4..4b4b7c0804847789df2bbe06e4c01283172fb311 100644
--- a/submissions/search_indexes.py
+++ b/submissions/search_indexes.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/signals.py b/submissions/signals.py
index 40ef1c43f3b48fdf5971583416140038e6669630..af402c3249b174f5cf339850e07d195d69d6752f 100644
--- a/submissions/signals.py
+++ b/submissions/signals.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/tasks.py b/submissions/tasks.py
index e3113cf3d8cf892e1915e4db2875e699eada2372..9259daa2ce09bebebe211274c02f4e8b5ed099d6 100644
--- a/submissions/tasks.py
+++ b/submissions/tasks.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
from datetime import timedelta
@@ -13,7 +13,7 @@ from .signals import (
@app.task(bind=True)
def send_editorial_assignment_invitations(self):
- """Send invitation email to 'next EditorialAssignment' in que."""
+ """Send invitation email to 'next EditorialAssignment' in queue."""
qs = Submission.objects.unassigned().has_editor_invitations_to_be_sent().distinct()
submission_ids = qs.values_list('id', flat=True)
submissions_count = len(submission_ids)
diff --git a/submissions/templates/partials/submissions/pool/submission_info_table.html b/submissions/templates/partials/submissions/pool/submission_info_table.html
index 72dedee19df8c14c6f64962712699bfe61f90413..86e6d5bf07277ef5830a3cbdc7ce2dce8f0e78dd 100644
--- a/submissions/templates/partials/submissions/pool/submission_info_table.html
+++ b/submissions/templates/partials/submissions/pool/submission_info_table.html
@@ -46,10 +46,10 @@
<td>
{% if submission.editor_in_charge %}
{{ submission.editor_in_charge }}
- {% elif request.user.contributor.is_MEC %}
- <strong class="text-danger">You can volunteer to become Editor-in-charge by <a href="{% url 'submissions:volunteer_as_EIC' submission.preprint.identifier_w_vn_nr %}">clicking here</a>.</strong>
+ {% elif perms.scipost.can_assign_submissions %}
+ <a href="{% url 'submissions:assign_submission' submission.preprint.identifier_w_vn_nr %}">Send a new assignment request</a>
{% else %}
- <em>No editor assigned yet.</em>
+ <strong class="text-danger">You can volunteer to become Editor-in-charge by <a href="{% url 'submissions:editorial_assignment' submission.preprint.identifier_w_vn_nr %}">clicking here</a>.</strong>
{% endif %}
</td>
</tr>
diff --git a/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html b/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html
index a3d3168c2f51d25e24b35b10ab1dd4a89a8fc388..62a79ddf99323e91faf0c6929c07093f615d5bd6 100644
--- a/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html
+++ b/submissions/templates/partials/submissions/refinv_auto_reminders_tooltip.html
@@ -1 +1,3 @@
-<i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="In case of no response to initial invitation, reminders will be sent automatically after 2, then 4 weekdays (with cc to EIC).<br>If there is no response after a week, you (as EIC) will be notified.<br>If accepted, a reminder will be sent to the referee 1 week before deadline."></i>
+<a href="javascript:;" data-toggle="tooltip" data-html="true" title="In case of no response to initial invitation, reminders will be sent automatically after 2, then 4 weekdays (with cc to EIC).<br>If there is no response after a week, you (as EIC) will be notified.<br>If accepted, a reminder will be sent to the referee 1 week before deadline.">
+ <i class="fa fa-info-circle"></i>
+</a>
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index 17da722c6b5b5657e495c54d070ff39c364fc1a6..2d5a887da3b5c7b7da51a101ad4a05155cf7a71d 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -7,24 +7,39 @@
{% load user_groups %}
{% block breadcrumb_items %}
- <a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
- {% if submission %}
- <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
- <span class="breadcrumb-item">{{ submission.preprint.identifier_w_vn_nr }}</span>
- {% else %}
- <span class="breadcrumb-item">Pool</span>
- {% endif %}
+<a href="{% url 'scipost:personal_page' %}" class="breadcrumb-item">Personal Page</a>
+{% if submission %}
+<a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
+<span class="breadcrumb-item">{{ submission.preprint.identifier_w_vn_nr }}</span>
+{% else %}
+<span class="breadcrumb-item">Pool</span>
+{% endif %}
{% endblock %}
{% block pagetitle %}: Submissions Pool{% endblock pagetitle %}
{% block content %}
- {% is_edcol_admin request.user as is_ECAdmin %}
+{% is_edcol_admin request.user as is_ECAdmin %}
+
+<div class="row">
+ <div class="col-6">
+ <h1>SciPost Submissions Pool</h1>
+ </div>
+ <div class="col-6">
+ <div class="border border-danger p-2">
+ Do you know know qualified candidates who could serve as Fellow in a College?<br/>
+ Nominate them by <a href="{% url 'colleges:potential_fellowship_create' %}">adding a Potential Fellowship</a>.
+ {% if nr_potfels_to_vote_on > 0 %}
+ <br/>
+ <span class="text-danger">You can vote on {{ nr_potfels_to_vote_on }} nomination{{ nr_potfels_to_vote_on|pluralize }}: please go to the <a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships</a> page.</span>
+ {% endif %}
+ </div>
+ </div>
+</div>
- <div class="row">
- <div class="col-12">
- <h1>SciPost Submissions Pool</h1>
- {% if is_ECAdmin %}
+<div class="row">
+ <div class="col-12">
+ {% if is_ECAdmin %}
{% if recommendations.voting_in_preparation or recommendations.put_to_voting or latest_submission_events or pre_screening_subs %}
<div class="quote-border">
diff --git a/submissions/templates/submissions/select_referee.html b/submissions/templates/submissions/select_referee.html
index edfffc089f59cbc559429ff4f6886f52c7c05844..d93be55db2d140233977add36d3e306ea5d65f7d 100644
--- a/submissions/templates/submissions/select_referee.html
+++ b/submissions/templates/submissions/select_referee.html
@@ -92,6 +92,7 @@
<th>Name<br/><br/></th>
<th>Registered Contributor?<br/><br/></th>
<th>Email known?<br/><br/></th>
+ <th>Accepts<br/>refereeing requests?</th>
<th>Action<br/><span class="text-muted font-weight-normal">(Unregistered people will also automatically receive a registration invitation)</span></th>
</tr>
</thead>
@@ -100,15 +101,28 @@
<tr>
<td>{{ profile }}</td>
<td>{% if profile.contributor %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
- <td>{% if profile.email %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
- <td>{% if profile.email %}Send refereeing invitation <a href="{% url 'submissions:invite_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr profile_id=profile.id auto_reminders_allowed=1 %}">with</a> or <a href="{% url 'submissions:invite_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr profile_id=profile.id auto_reminders_allowed=0 %}">without</a> auto-reminders {% include 'partials/submissions/refinv_auto_reminders_tooltip.html' %}{% else %}<span class="text-danger">Cannot send an invitation without an email</span> <i class="fa fa-arrow-right"></i> Add one:
- <form class="form-inline" action="{% url 'profiles:add_profile_email' profile_id=profile.id %}" method="post">
- {% csrf_token %}
- {{ profile_email_form|bootstrap }}
- <input type="hidden" name="next" value="{{ request.get_full_path }}">
- <input class="btn btn-outline-secondary" type="submit" value="Add">
- </form>
- {% endif %}
+ <td>{% if profile.email %}<i class="fa fa-check-circle text-success"></i> <span class="text-muted">{{ profile.email }}</span>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>
+ {% if profile.accepts_refereeing_requests %}
+ <i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>
+ {% endif %}
+ </td>
+ <td>
+ {% if profile.accepts_refereeing_requests %}
+ {% if profile.email %}
+ Send refereeing invitation <a href="{% url 'submissions:invite_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr profile_id=profile.id auto_reminders_allowed=1 %}">with</a> or <a href="{% url 'submissions:invite_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr profile_id=profile.id auto_reminders_allowed=0 %}">without</a> auto-reminders. {% include 'partials/submissions/refinv_auto_reminders_tooltip.html' %}
+ {% else %}
+ <span class="text-danger">Cannot send an invitation without an email</span> <i class="fa fa-arrow-right"></i> Add one:
+ <form class="form-inline" action="{% url 'profiles:add_profile_email' profile_id=profile.id %}" method="post">
+ {% csrf_token %}
+ {{ profile_email_form|bootstrap }}
+ <input type="hidden" name="next" value="{{ request.get_full_path }}">
+ <input class="btn btn-outline-secondary" type="submit" value="Add">
+ </form>
+ {% endif %}
+ {% else %}
+ <span class="text-danger">This person does not accept refereeing requests</span>
+ {% endif %}
</td>
</tr>
{% empty %}
@@ -127,9 +141,9 @@
<form action="{% url 'submissions:add_referee_profile' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}" method="post">
{% csrf_token %}
{{ profile_form|bootstrap }}
- <button type="submit" name="submit" class="btn btn-primary">Add to database</button>
- <h4 class="d-inline"><em>(does not send invitation yet: you will return to this page, from which you can then invite this referee)</em></h4>
+ <p><em>This form does not send invitation yet: you will return to this page, from which you can then invite this referee.</em></p>
+ <button type="submit" name="submit" class="btn btn-primary">Add to database</button>
</form>
</div>
</div>
diff --git a/submissions/templates/submissions/sub_and_ref_procedure.html b/submissions/templates/submissions/sub_and_ref_procedure.html
index 20e4ab4edc79ffc38776d423e8eb58a7ff64f9a6..a57a79d4ae5cd9a842eb1de9d5e73f94e86ce2b4 100644
--- a/submissions/templates/submissions/sub_and_ref_procedure.html
+++ b/submissions/templates/submissions/sub_and_ref_procedure.html
@@ -24,15 +24,15 @@
<h2>Submission</h2>
<p>This is a quick summary. For more details, see the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>
and the <a href="{% url 'submissions:author_guidelines' %}">author guidelines</a>.</p>
- <h3>To submit an article for publication in a SciPost Journal, authors must:</h3>
+ <h3>To submit an article for publication in a SciPost Journal, you must:</h3>
<ol>
- <li>Prepare their manuscript following the <a href="{% url 'submissions:author_guidelines' %}">author guidelines</a></li>
+ <li>Prepare your manuscript following the <a href="{% url 'submissions:author_guidelines' %}">author guidelines</a></li>
<li>Make your preprint publicly available on an appropriate preprint server:
<ul>
<li>Physics, Mathematics, Computer Science: <a href="http://arxiv.org">arXiv.org</a></li>
</ul>
</li>
- <li>After appearance on the preprint server, fill the SciPost <a href="{% url 'submissions:submit_manuscript' %}">Submission</a> form, selecting which SciPost Journal to submit to and providing domain and speciality specifications.</li>
+ <li>After appearance on the preprint server, fill the SciPost <a href="{% url 'submissions:submit_manuscript' %}">Submission</a> form, selecting which SciPost Journal to submit to (and providing additional info such as domain and speciality specifications).</li>
</ol>
</div>
</div>
@@ -46,11 +46,13 @@
<ol>
<li>
<strong>Pre-screening: plagiarism and conflicts of interest</strong>
- <br/>The Submission is checked for plagiarism, and appropriate action (immediate rejection; request to authors for modified version) is taken if necessary. A thorough scan is performed to flag potential conflicts of interest of authors with Fellows.
+ <br/>The Submission is checked by Editorial Administration for plagiarism and appropriate action (immediate rejection; request to authors for modified version) is taken if necessary. A thorough scan is performed to flag potential conflicts of interest of authors with Fellows.
</li>
<li>
<strong>Screening: finding an Editor-in-charge</strong>
- <br/>The Submission is internally forwarded to Fellows of the relevant Editorial College, for them to consider becoming Editor-in-charge. For our Commons journals, members of the community can also be approached (in which case they become guest Fellows). If a (guest) Fellow expresses interest in the submission, he/she becomes Editor-in-charge. This screening process should occur on a timescale of 5 working days. Authors are contacted by our editorial administration in case of problems, in particular if extensions to the screening period prove necessary.</li>
+ <br/>The Submission is internally forwarded to Fellows of the relevant Editorial College, for them to consider becoming Editor-in-charge. At this stage, qualified Fellows can exceptionally volunteer and immediately formulate a Recommendation for rejection without refereeing (this Recommendation is then processed according to the Editorial Recommendation rules below).
+ As a special provision for our Commons-class journals, members of the community can also be approached (in which case they become guest Fellows).
+ If a (guest) Fellow expresses interest in the submission, he/she becomes Editor-in-charge. This screening process should occur on a timescale of 5 working days. Authors are contacted by our editorial administration in case of problems, in particular if extensions to the screening period prove necessary.</li>
<li>
<strong>Activation of the Submission page</strong>
<br/>Following successful screening, a Submission Page is activated. The Submission is immediately opened to Contributor Reports, Comments and Author Replies, all of which are vetted by an Editorial Fellow before eventually appearing online.</li>
@@ -58,16 +60,16 @@
<strong>Refereeing round</strong>
<br/>The Editor-in-charge starts a refereeing round (whose duration depends on the Journal, see below), inviting specific Contributors to provide an Invited Report.
During a refereeing round, registered Contributors to SciPost can volunteer a Contributed Report, and authors can continuously provide Replies to Reports and Comments.
- The contents of Reports are publicly viewable, but the author of the Report can choose public anonymity (which is then known to Editors only). Authors are informed by email if a Report or a Comment on their paper is vetted through and published online (authors are welcome to respond, but should not feel obliged to do so before the refereeing round is closed).</li>
+ The contents of Reports are publicly viewable, but the author of the Report can choose public anonymity (their identity is then known to Editors only). Authors are informed by email if a Report or a Comment on their paper is vetted through and published online (authors are welcome to respond, but should not feel obliged to do so, unless the Editor-in-charge specifically requests it).</li>
<li>
<strong>Closing of the refereeing round</strong>
- <br/>At the end of the refereeing round, submission of Contributed Reports on the Submission Page is deactivated (reports from invited referees can still be considered, at the discretion of the Editor-in-charge). The Editor-in-charge invites the authors to finalize their responses to any submitted Reports and Comments before the Editorial Recommendation is formulated.</li>
+ <br/>At the end of the refereeing round, submission of Contributed Reports on the Submission Page is deactivated (reports from invited referees can still be considered, at the discretion of the Editor-in-charge). If deemed appropriate, Editor-in-charge invites the authors to finalize their responses to any submitted Reports and Comments before the Editorial Recommendation is formulated.</li>
<li>
<strong>Editorial recommendation</strong>
- <br/>Reports, Replies and Comments are then assessed by the Editor-in-charge, who formulates an editorial recommendation.
+ <br/>Reports, Replies and Comments are then assessed by the Editor-in-charge, who formulates an Editorial Recommendation.
<ol>
- <li>If the editorial recommendation is for publication or rejection, it is forwarded to the Editorial College, which takes the binding editorial decision by consultation of the relevant specialty's Editorial Fellows (voting rights are given to at least 9 Fellows). If the recommendation is to publish the paper as Tier I (targeting approximately the top 10% of articles considered), a selection of Editorial Fellows from all specialties are given voting rights and can thus support or object to this promotion.</li>
- <li>If the Editorial Recommendation is for a minor or major revision, it is communicated directly to the authors, who must then resubmit. Upon resubmission, the Editor-in-charge can either start a new refereeing round or directly formulate a new editorial recommendation.</li>
+ <li>If the Editorial Recommendation is for publication or rejection, it is forwarded to the Editorial College, which takes the binding editorial decision by consultation of the relevant specialty's Editorial Fellows (voting rights are given to at least 9 Fellows). If the recommendation is to publish the paper as Tier I (targeting approximately the top 10% of articles considered), a selection of Editorial Fellows from all specialties are given voting rights and can thus support or object to this promotion.</li>
+ <li>If the Editorial Recommendation is for a minor or major revision, it is communicated directly to the authors, who must then resubmit. Upon resubmission, the Editor-in-charge can either start a new refereeing round or directly formulate a new Editorial Recommendation.</li>
</ol></li>
<li>
<strong>Decision</strong>
diff --git a/submissions/templates/submissions/withdraw_manuscript.html b/submissions/templates/submissions/withdraw_manuscript.html
new file mode 100644
index 0000000000000000000000000000000000000000..345ec42657b44d08e10e7eeb11973b0261c9c10a
--- /dev/null
+++ b/submissions/templates/submissions/withdraw_manuscript.html
@@ -0,0 +1,42 @@
+{% extends 'submissions/base.html' %}
+
+{% load bootstrap %}
+
+{% block pagetitle %}: withdraw manuscript{% endblock pagetitle %}
+
+{% block breadcrumb_items %}
+ {{ block.super }}
+ <a href="{{ submission.get_absolute_url }}" class="breadcrumb-item">{{ submission.preprint.identifier_w_vn_nr }}</a>
+ <span class="breadcrumb-item">Withdraw Submission</span>
+{% endblock %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight"><i class="fa fa-exclamation-triangle text-warning"></i> Withdraw Submission</h1>
+ <div class="mt-3 mb-4">
+ <h3 class="text-primary">{{submission.title}}</h3>
+ <h3>by {{submission.author_list}}</h3>
+ </div>
+ <h3 class="mt-2">Submission summary</h3>
+ {% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 show_abstract=0 %}
+ <br>
+ {% include 'partials/submissions/submission_status.html' with submission=submission %}
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ <h3 class="text-danger">Are you sure you want to withdraw this manuscript?</h3>
+ <p>This will terminate the editorial process for the above submission.</p>
+ <form action="{% url 'submissions:withdraw_manuscript' submission.preprint.identifier_w_vn_nr %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap:'0,12' }}
+ <p class="text-danger">CAREFUL: ONE-CLICK, ONE-WAY ACTION!
+ <input class="btn btn-danger" type="submit" value="Submit"></p>
+ </form>
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/submissions/templatetags/lookup.py b/submissions/templatetags/lookup.py
index 2a051035679255992d82da4a3ba2c0334dc925b4..a0604495bdbab66514370f8508e1d130ff821f84 100644
--- a/submissions/templatetags/lookup.py
+++ b/submissions/templatetags/lookup.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/templatetags/submissions_admin.py b/submissions/templatetags/submissions_admin.py
index 43bcc5d7a042d6d305ecfbb9d47dd84961d48048..27bf23cf65e5cab16e4d07444853eabc47a8f6b7 100644
--- a/submissions/templatetags/submissions_admin.py
+++ b/submissions/templatetags/submissions_admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/templatetags/submissions_extras.py b/submissions/templatetags/submissions_extras.py
index 760bcb91e475664937523ab63f79130b63e48316..4f7708c550901c648be6485dc47335d7b5f32b26 100644
--- a/submissions/templatetags/submissions_extras.py
+++ b/submissions/templatetags/submissions_extras.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/templatetags/submissions_pool.py b/submissions/templatetags/submissions_pool.py
index 50b9a4ac266af8f369206bf601de3f16b8670d6a..1928da05bee1437ee727371aa11aa6a9938cbb27 100644
--- a/submissions/templatetags/submissions_pool.py
+++ b/submissions/templatetags/submissions_pool.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/test_models.py b/submissions/test_models.py
index feb5d431d04cd53b69858536bd8366cbb9f76642..9af866c68a816d8b2b4cb638ddb837daf586e94a 100644
--- a/submissions/test_models.py
+++ b/submissions/test_models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/test_utils.py b/submissions/test_utils.py
index 7ca6d0792384210e48ef098f1a825f3effb17f67..d5905016d775bc7ab9b1f2075a5d84be8bf5b110 100644
--- a/submissions/test_utils.py
+++ b/submissions/test_utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/test_views.py b/submissions/test_views.py
index c2bf1dba5b4cb2cc410c96699a10c3925e4a2f40..ec2687c2faecaea68b605bd129e59982f879a66d 100644
--- a/submissions/test_views.py
+++ b/submissions/test_views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/urls.py b/submissions/urls.py
index 3481747258358b4845ca554bb0fad478c52b8861..7f4be68e20aa7c27ecb81062c0f3a935cc8cc746 100644
--- a/submissions/urls.py
+++ b/submissions/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -70,6 +70,7 @@ urlpatterns = [
url(r'^admin/reports/(?P<report_id>[0-9]+)/compile$',
views.report_pdf_compile, name='report_pdf_compile'),
+ # Submission, resubmission, withdrawal
url(r'^resubmit_manuscript$', views.resubmit_manuscript, name='resubmit_manuscript'),
url(r'^submit_manuscript$', views.prefill_using_arxiv_identifier, name='submit_manuscript'),
url(r'^submit_manuscript/scipost$',
@@ -78,6 +79,10 @@ urlpatterns = [
views.RequestSubmissionUsingArXivView.as_view(), name='submit_manuscript_arxiv'),
url(r'^submit_manuscript/prefill$',
views.prefill_using_arxiv_identifier, name='prefill_using_identifier'),
+ url(r'^withdraw_manuscript/{regex}/$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
+ views.withdraw_manuscript, name='withdraw_manuscript'),
+
+ # Pool
url(r'^pool/$', views.pool, name='pool'),
url(r'^pool/{regex}/$'.format(regex=SUBMISSIONS_COMPLETE_REGEX), views.pool, name='pool'),
url(r'^add_remark/{regex}$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
@@ -94,8 +99,6 @@ urlpatterns = [
url(r'^pool/{regex}/editorial_assignment/(?P<assignment_id>[0-9]+)/$'.format(
regex=SUBMISSIONS_COMPLETE_REGEX), views.editorial_assignment,
name='editorial_assignment'),
- url(r'^volunteer_as_EIC/{regex}$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
- views.volunteer_as_EIC, name='volunteer_as_EIC'),
url(r'^assignment_failed/{regex}$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
views.assignment_failed, name='assignment_failed'),
# Editorial workflow and refereeing
diff --git a/submissions/utils.py b/submissions/utils.py
index 0165b036a6df382470582e534f2ada440307b11d..454ae4a19d5cebe8de93bd630797cca1f68a8faa 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/submissions/views.py b/submissions/views.py
index 1d7f257cc86afc33cbd1833939aa9e14e1005326..d9d15c3301356488b2558e8df790e68da65c98da 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
@@ -25,7 +25,8 @@ from django.views.generic.list import ListView
from .constants import (
STATUS_VETTED, STATUS_EIC_ASSIGNED, SUBMISSION_STATUS, STATUS_ASSIGNMENT_FAILED,
- STATUS_DRAFT, CYCLE_DIRECT_REC, STATUS_ACCEPTED, STATUS_DEPRECATED)
+ STATUS_WITHDRAWN, STATUS_DRAFT, CYCLE_DIRECT_REC, STATUS_COMPLETED, STATUS_DEPRECATED,
+ DEPRECATED)
from .helpers import check_verified_author, check_unverified_author
from .models import (
Submission, EICRecommendation, EditorialAssignment, RefereeInvitation, Report, SubmissionEvent)
@@ -33,9 +34,8 @@ from .mixins import SubmissionAdminViewMixin
from .forms import (
SubmissionIdentifierForm, SubmissionForm, SubmissionSearchForm, RecommendationVoteForm,
ConsiderAssignmentForm, InviteEditorialAssignmentForm, EditorialAssignmentForm, VetReportForm,
- SetRefereeingDeadlineForm, RefereeSearchForm, #RefereeSelectForm,
- iThenticateReportForm, VotingEligibilityForm,
- #RefereeRecruitmentForm,
+ SetRefereeingDeadlineForm, RefereeSearchForm,
+ iThenticateReportForm, VotingEligibilityForm, WithdrawSubmissionForm,
ConsiderRefereeInvitationForm, EditorialCommunicationForm, ReportForm,
SubmissionCycleChoiceForm, ReportPDFForm, SubmissionReportsForm, EICRecommendationForm,
SubmissionPoolFilterForm, FixCollegeDecisionForm, SubmissionPrescreeningForm,
@@ -45,6 +45,7 @@ from .signals import (
notify_submission_author_new_report, notify_eic_invitation_reponse, notify_report_vetted)
from .utils import SubmissionUtils
+from colleges.models import PotentialFellowship
from colleges.permissions import fellowship_required, fellowship_or_admin_required
from comments.forms import CommentForm
from common.helpers import get_new_secrets_key
@@ -225,6 +226,64 @@ def prefill_using_arxiv_identifier(request):
return render(request, 'submissions/submission_prefill_form.html', context)
+@login_required
+def withdraw_manuscript(request, identifier_w_vn_nr):
+ """
+ Withdrawal of the submission by one of the submitting authors.
+
+ This method performs the following actions:
+ - makes the Submission and its previous versions publicly invisible
+ - marks any Editorial Assignment as completed
+ - deprecates any Editorial Recommendation
+ - emailing authors, EIC (cc to EdAdmin)
+ - deprecates all outstanding refereeing requests (emailing referees)
+ - adds an event.
+
+ GET shows the info/confirm page
+ POST performs the action and returns to the personal page.
+ """
+ submission = get_object_or_404(Submission, preprint__identifier_w_vn_nr=identifier_w_vn_nr)
+
+ if request.user.contributor.id != submission.submitted_by.id:
+ errormessage = ('You are not marked as the submitting author of this Submission, '
+ 'and thus are not allowed to withdraw it.')
+ return render(request, 'scipost/error.html', {'errormessage': errormessage})
+
+ form = WithdrawSubmissionForm(request.POST or None, submission=submission)
+ # form = ConfirmationForm(request.POST or None)
+ if form.is_valid():
+ if form.is_confirmed():
+ submission = form.save()
+
+ # Inform EIC
+ mail_sender_eic = DirectMailUtil(
+ mail_code='eic/inform_eic_manuscript_withdrawn',
+ instance=submission)
+ mail_sender_eic.send()
+
+ # Confirm withdrawal to authors
+ mail_sender_authors = DirectMailUtil(
+ mail_code='authors/inform_authors_manuscript_withdrawn',
+ instance=submission)
+ mail_sender_authors.send()
+
+ # Email all referees (if outstanding), cancel all outstanding
+ for invitation in submission.referee_invitations.outstanding():
+ DirectMailUtil(
+ mail_code='referees/inform_referee_manuscript_withdrawn',
+ instance=invitation).send()
+ submission.referee_invitations.outstanding().update(cancelled=True)
+
+ # All done.
+ submission.add_general_event('The manuscript has been withdrawn by the authors.')
+ messages.success(request, 'Your manuscript has been withdrawn.')
+ else:
+ messages.error(request, 'Withdrawal procedure aborted')
+ return redirect(reverse('scipost:personal_page'))
+ context = {'submission': submission, 'form': form}
+ return render(request, 'submissions/withdraw_manuscript.html', context)
+
+
class SubmissionListView(PaginationMixin, ListView):
"""List all publicly available Submissions."""
@@ -497,6 +556,8 @@ def pool(request, identifier_w_vn_nr=None):
submissions = submissions.select_related(
'preprint', 'publication').prefetch_related('eicrecommendations')
+ nr_potfels_to_vote_on = PotentialFellowship.objects.to_vote_on(
+ request.user.contributor).count()
recs_to_vote_on = EICRecommendation.objects.user_must_vote_on(request.user).filter(
submission__in=submissions)
recs_current_voted = EICRecommendation.objects.user_current_voted(request.user).filter(
@@ -515,6 +576,7 @@ def pool(request, identifier_w_vn_nr=None):
'submission_status': SUBMISSION_STATUS,
'assignments_to_consider': assignments_to_consider,
'consider_assignment_form': consider_assignment_form,
+ 'nr_potfels_to_vote_on': nr_potfels_to_vote_on,
'recs_to_vote_on': recs_to_vote_on,
'recs_current_voted': recs_current_voted,
'rec_vote_form': rec_vote_form,
@@ -694,8 +756,8 @@ def editorial_assignment(request, identifier_w_vn_nr, assignment_id=None):
else:
# Inform authors about new status.
mail_sender = DirectMailUtil(
- mail_code='authors/inform_authors_eic_assigned_direct_eic',
- assignment=submission)
+ mail_code='authors/inform_authors_eic_assigned_direct_rec',
+ instance=submission)
mail_sender.send()
submission.add_general_event('The Editor-in-charge has been assigned.')
@@ -735,72 +797,6 @@ def assignment_request(request, assignment_id):
}))
-@login_required
-@fellowship_required()
-@transaction.atomic
-def volunteer_as_EIC(request, identifier_w_vn_nr):
- """Single click action to take charge of a Submission.
-
- Called when a Fellow volunteers while perusing the submissions pool.
- This is an adapted version of the assignment_request method.
- """
- submission = get_object_or_404(Submission.objects.pool(request.user),
- preprint__identifier_w_vn_nr=identifier_w_vn_nr)
- errormessage = None
- if submission.status == STATUS_ASSIGNMENT_FAILED:
- errormessage = '<h3>Thank you for considering.</h3>'
- errormessage += 'This Submission has failed pre-screening and has been rejected.'
- elif submission.editor_in_charge:
- errormessage = '<h3>Thank you for considering.</h3>'
- errormessage += (submission.editor_in_charge.get_title_display() + ' ' +
- submission.editor_in_charge.user.last_name +
- ' has already agreed to be Editor-in-charge of this Submission.')
- elif not hasattr(request.user, 'contributor'):
- errormessage = (
- 'You do not have an activated Contributor account. Therefore, you cannot take charge.')
-
- if errormessage:
- messages.warning(request, errormessage)
- return redirect(reverse('submissions:pool'))
-
- # The Contributor may already have an EditorialAssignment due to an earlier invitation.
- assignment, __ = EditorialAssignment.objects.get_or_create(
- submission=submission, to=request.user.contributor)
- # Explicitly update afterwards, since update_or_create does not properly do the job.
- EditorialAssignment.objects.filter(id=assignment.id).update(
- status=STATUS_ACCEPTED, date_answered=timezone.now())
-
- # Set deadlines
- deadline = timezone.now() + submission.submitted_to.refereeing_period
-
- # Update Submission data
- Submission.objects.filter(id=submission.id).update(
- status=STATUS_EIC_ASSIGNED,
- editor_in_charge=request.user.contributor,
- open_for_reporting=True,
- reporting_deadline=deadline,
- open_for_commenting=True,
- latest_activity=timezone.now())
-
- # Deprecate old Editorial Assignments
- EditorialAssignment.objects.filter(submission=submission).invited().update(
- status=STATUS_DEPRECATED)
-
- # Send emails to EIC and authors regarding the EIC assignment.
- assignment = EditorialAssignment.objects.get(id=assignment.id) # Update before use in mail
- SubmissionUtils.load({'assignment': assignment})
- SubmissionUtils.send_EIC_appointment_email()
- SubmissionUtils.send_author_prescreening_passed_email()
-
- # Add SubmissionEvents
- submission.add_general_event('The Editor-in-charge has been assigned.')
- notify_editor_assigned(request.user, assignment, False)
-
- messages.success(request, 'Thank you for becoming Editor-in-charge of this submission.')
- return redirect(reverse('submissions:editorial_page',
- args=[submission.preprint.identifier_w_vn_nr]))
-
-
@login_required
@permission_required('scipost.can_assign_submissions', raise_exception=True)
@transaction.atomic
diff --git a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
index e2f489e94ae9dc7430be4b0c90f6f6134ebd57dc..ba045fd971f02c8fc728ce5ca6d51039a140010f 100644
--- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
+++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
@@ -2,7 +2,7 @@
Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
</p>
<p>
- For your information, a Contributor Comment has been posted on a recent Report on your Submission
+ For your information, your Submission
<br><br>
{{ submission.title }}
<br>by {{ submission.author_list }}<br>
diff --git a/templates/email/authors/inform_authors_eic_assigned_direct_rec.json b/templates/email/authors/inform_authors_eic_assigned_direct_rec.json
index 8d952bcb257fede2c6d20158fe25f078df5d1ed2..881b84e127ad9effba79c3f096a4ef74cb525000 100644
--- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.json
+++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.json
@@ -1,7 +1,7 @@
{
"subject": "SciPost: Editor assigned",
"to_address": "submitted_by.user.email",
- "bcc_to": "edadmin@scipost.org",
+ "bcc_to": "editor_in_charge.user.email,edadmin@scipost.org",
"from_address_name": "SciPost Refereeing",
"from_address": "refereeing@scipost.org",
"context_object": "submission"
diff --git a/templates/email/authors/inform_authors_manuscript_withdrawn.html b/templates/email/authors/inform_authors_manuscript_withdrawn.html
new file mode 100644
index 0000000000000000000000000000000000000000..cc6f29227f62430b18a73bcf76711cd02fb0d0b2
--- /dev/null
+++ b/templates/email/authors/inform_authors_manuscript_withdrawn.html
@@ -0,0 +1,20 @@
+<p>
+ Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
+</p>
+<p>
+ We hereby acknowledge withdrawal of your recent SciPost submission,
+</p>
+<p>
+ {{ submission.title }}
+ <br/>
+ by {{ submission.author_list }}.
+</p>
+<p>
+ Editorial processing of your manuscript is hereby terminated, and the associated submission page has been removed from public view. You are now free to send your manuscript to an alternative journal.
+</p>
+<p>
+ Despite this outcome, we thank you very much for your contribution. If you have further questions or comments, please feel free to get in touch with our <a href="mailto:edadmin@scipost.org">editorial administration</a>.
+</p>
+<p>Sincerely,</p>
+<p>The SciPost Team</p>
+{% include 'email/_footer.html' %}
diff --git a/templates/email/authors/inform_authors_manuscript_withdrawn.json b/templates/email/authors/inform_authors_manuscript_withdrawn.json
new file mode 100644
index 0000000000000000000000000000000000000000..f28043ed084ddb0e12fc8a9d9b1e27bd9f848dda
--- /dev/null
+++ b/templates/email/authors/inform_authors_manuscript_withdrawn.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: manuscript withdrawn",
+ "to_address": "submitted_by.user.email",
+ "bcc_to": "edadmin@scipost.org",
+ "from_address_name": "SciPost Submissions",
+ "from_address": "submissions@scipost.org",
+ "context_object": "submission"
+}
diff --git a/templates/email/eic/inform_eic_manuscript_withdrawn.html b/templates/email/eic/inform_eic_manuscript_withdrawn.html
new file mode 100644
index 0000000000000000000000000000000000000000..e0ed174be2f5004005e1cd846a059fd8056b59d0
--- /dev/null
+++ b/templates/email/eic/inform_eic_manuscript_withdrawn.html
@@ -0,0 +1,19 @@
+<p>Dear {{ submission.editor_in_charge.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p>
+
+<p>
+ For your information, the authors of Submission
+</p>
+<p>
+ {{ submission.title }}
+ <br/>
+ by {{ submission.author_list }}
+</p>
+<p>
+ have withdrawn their manuscript. There is no further action required from your part, and your editorial assignment is now marked as completed.
+</p>
+<p>
+ Many thanks,<br>
+ The SciPost Team.
+</p>
+
+{% include 'email/_footer.html' %}
diff --git a/templates/email/eic/inform_eic_manuscript_withdrawn.json b/templates/email/eic/inform_eic_manuscript_withdrawn.json
new file mode 100644
index 0000000000000000000000000000000000000000..7f2e66ca80ee79cd12347ee964b1a8078641e79b
--- /dev/null
+++ b/templates/email/eic/inform_eic_manuscript_withdrawn.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: manuscript withdrawn",
+ "to_address": "editor_in_charge.user.email",
+ "bcc_to": "edadmin@scipost.org",
+ "from_address_name": "SciPost Editorial Admin",
+ "from_address": "submissions@scipost.org",
+ "context_object": "submission"
+}
diff --git a/templates/email/fellows/email_fellow_tasklist.html b/templates/email/fellows/email_fellow_tasklist.html
index ce32373ebddedf2711df6ee54fb5d73bb0456405..f0fc50dba9c819144f429f6bc8c7eefd5ac6e0de 100644
--- a/templates/email/fellows/email_fellow_tasklist.html
+++ b/templates/email/fellows/email_fellow_tasklist.html
@@ -2,6 +2,12 @@
<p>Please find below a summary of your current assignments, with (if applicable) pending and upcoming required actions. Many thanks in advance for your timely intervention on any point in need of attention. Your good work as an Editorial Fellow is greatly appreciated!</p>
+{% if nr_potfels_to_vote_on > 0 %}
+<br/>
+<h3>Nominations to the Editorial College</h3>
+<p>You have {{ nr_potfels_to_vote_on }} nomination{{ nr_potfels_to_vote_on|pluralize }} to vote on, please visit the <a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships</a> page to cast your vote{{ nr_potfels_to_vote_on|pluralize }}.</p>
+{% endif %}
+
{% if recs_to_vote_on %}
<br/>
<h3>Recommendations for you to vote on</h3>
diff --git a/templates/email/referees/inform_referee_manuscript_withdrawn.html b/templates/email/referees/inform_referee_manuscript_withdrawn.html
new file mode 100644
index 0000000000000000000000000000000000000000..78b25a0f12d8c258cbf17401317179f817f4ba45
--- /dev/null
+++ b/templates/email/referees/inform_referee_manuscript_withdrawn.html
@@ -0,0 +1,20 @@
+<p>
+ Dear {{invitation.referee.get_title_display}} {{invitation.referee.user.last_name}},
+</p>
+<p>
+ This is a simple email to inform you that the authors of
+</p>
+<p>
+ {{invitation.submission.title}}
+ <br>
+ by {{invitation.submission.author_list}}
+</p>
+<p>
+ have withdrawn their manuscript. Your report is thus not needed anymore.
+</p>
+<p>
+ Sincerely,
+ <br>
+ The SciPost Team.
+</p>
+{% include 'email/_footer.html' %}
diff --git a/templates/email/referees/inform_referee_manuscript_withdrawn.json b/templates/email/referees/inform_referee_manuscript_withdrawn.json
new file mode 100644
index 0000000000000000000000000000000000000000..4367c9e573a52cdad8a51e33f1f2d980a87204e8
--- /dev/null
+++ b/templates/email/referees/inform_referee_manuscript_withdrawn.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: manuscript withdrawn",
+ "to_address": "referee.user.email",
+ "bcc_to": "submission.editor_in_charge.user.email,edadmin@scipost.org",
+ "from_address_name": "SciPost Refereeing",
+ "from_address": "refereeing@scipost.org",
+ "context_object": "invitation"
+}
diff --git a/theses/admin.py b/theses/admin.py
index 94177b185ecf4c00bfe385a83071b0596ac5a578..9a2bb9456b86b0a9daf6c74fb5ca63939227117a 100644
--- a/theses/admin.py
+++ b/theses/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/apps.py b/theses/apps.py
index 0e16e0186e7f9435bc38b221c59e1573e000523b..945e73716f0dea76c1b222fcbe126b74583016c7 100644
--- a/theses/apps.py
+++ b/theses/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/constants.py b/theses/constants.py
index 2bd041a1c342b0b5416fff4bfb8f5228cadb3b32..710e5b14cc479684749f3ae09a2890145a5af825 100644
--- a/theses/constants.py
+++ b/theses/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/factories.py b/theses/factories.py
index 54865fd5107fef5644938afcf3d7df024ab303ed..c193e286f1bdbce16050bbe70c3b3e15e417a768 100644
--- a/theses/factories.py
+++ b/theses/factories.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/forms.py b/theses/forms.py
index 4d3242bac47a9786778c225968f4f051620ab6f7..655ccf90e695828505815d6ffaaa2e3e786ce70e 100644
--- a/theses/forms.py
+++ b/theses/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/helpers.py b/theses/helpers.py
index a3a6b6e35ac8f1e7b50c3c3f0cf329dfcd81ca6b..200ac07e4fa7b9f82638b85b8dc79902a7b2d4c0 100644
--- a/theses/helpers.py
+++ b/theses/helpers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/management/commands/create_theses.py b/theses/management/commands/create_theses.py
index 05da93dd5ba989a9f32fecb25405943ad3532bd7..6b532c636ef8e1bb064c3d3d31585db99195b05c 100644
--- a/theses/management/commands/create_theses.py
+++ b/theses/management/commands/create_theses.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/managers.py b/theses/managers.py
index 9da2cd077fe10d3ae2e8b030f9a009ac45d86e00..15850c3d735f41b794d55ce560945fd5ad0e1f1e 100644
--- a/theses/managers.py
+++ b/theses/managers.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/migrations/0002_auto_20190126_2058.py b/theses/migrations/0002_auto_20190126_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..3a73e755ce57f90d4bed04f440b57f0dba7f23c6
--- /dev/null
+++ b/theses/migrations/0002_auto_20190126_2058.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('theses', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='thesislink',
+ name='subject_area',
+ field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], default='Phys:QP', max_length=10),
+ ),
+ ]
diff --git a/theses/models.py b/theses/models.py
index 89593889c39b61b1d28675a9ac2b3fc706ad1b18..e50026a8002564a54caa2ca54d9ab9f6f080481f 100644
--- a/theses/models.py
+++ b/theses/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/search_indexes.py b/theses/search_indexes.py
index 1f8a8ec14c4dad93bbb3dfbe7e4863d7c28f6d27..7b701cab90c856c3ad9371f9253973fc0d499b19 100644
--- a/theses/search_indexes.py
+++ b/theses/search_indexes.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/test_forms.py b/theses/test_forms.py
index 585d229aabe00db067cb0095992d869bb5627ab2..cbccc099adbd9cd963c63fc1fc1de70b4b2b1fdd 100644
--- a/theses/test_forms.py
+++ b/theses/test_forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/test_models.py b/theses/test_models.py
index abfea743cb02ebfa8e2afad9ebd43b64e5071acc..a9d4e3f8c472ab3a312fc9a0def7f273a787f8fb 100644
--- a/theses/test_models.py
+++ b/theses/test_models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/test_views.py b/theses/test_views.py
index ec15bd9658410f3a432983c93f38c9c0d1544e8c..382afb4b1b09740baacf96164033d42cacdf1a62 100644
--- a/theses/test_views.py
+++ b/theses/test_views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/urls.py b/theses/urls.py
index 55b13f363e04547fd5d56060fa43ea9465ae8875..2c5ced9b896574f3bda17b513206f3bbc77466a3 100644
--- a/theses/urls.py
+++ b/theses/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/theses/views.py b/theses/views.py
index bc5a8ebfdf353a32ad86e212948cb0d37932a6dd..98275767d982ccee683b28a426f6d8ce028d62b7 100644
--- a/theses/views.py
+++ b/theses/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/admin.py b/virtualmeetings/admin.py
index 290c16932804f47e834f2faf76051cd01fff6131..e093092cfc7cb694e18fc2f57b45e07acfb4429e 100644
--- a/virtualmeetings/admin.py
+++ b/virtualmeetings/admin.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/apps.py b/virtualmeetings/apps.py
index 199239cc1b68cf14a202dc974cb1add2ec8360f4..80b6af231c91620c73627d289e0734aa3dc6e1ea 100644
--- a/virtualmeetings/apps.py
+++ b/virtualmeetings/apps.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/constants.py b/virtualmeetings/constants.py
index 1c280f461f07d888a2735e7c4978d6f41e0290d6..d9874562cfaa53e7fabf01a7c1613afda0a9eb74 100644
--- a/virtualmeetings/constants.py
+++ b/virtualmeetings/constants.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/forms.py b/virtualmeetings/forms.py
index 0ad28e598a8bf32039227efeaf7b1b6d17b54562..a4b52a91780eb366d394f23caadb520b0c6f65d0 100644
--- a/virtualmeetings/forms.py
+++ b/virtualmeetings/forms.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/migrations/0002_auto_20190126_2058.py b/virtualmeetings/migrations/0002_auto_20190126_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..54802394282c693b197ebe684245365258d2c33d
--- /dev/null
+++ b/virtualmeetings/migrations/0002_auto_20190126_2058.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-01-26 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import scipost.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('virtualmeetings', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='nomination',
+ name='expertises',
+ field=scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('Physics', (('Phys:AE', 'Atomic, Molecular and Optical Physics - Experiment'), ('Phys:AT', 'Atomic, Molecular and Optical Physics - Theory'), ('Phys:BI', 'Biophysics'), ('Phys:CE', 'Condensed Matter Physics - Experiment'), ('Phys:CT', 'Condensed Matter Physics - Theory'), ('Phys:CC', 'Condensed Matter Physics - Computational'), ('Phys:FD', 'Fluid Dynamics'), ('Phys:GR', 'Gravitation, Cosmology and Astroparticle Physics'), ('Phys:HE', 'High-Energy Physics - Experiment'), ('Phys:HT', 'High-Energy Physics - Theory'), ('Phys:HP', 'High-Energy Physics - Phenomenology'), ('Phys:MP', 'Mathematical Physics'), ('Phys:NE', 'Nuclear Physics - Experiment'), ('Phys:NT', 'Nuclear Physics - Theory'), ('Phys:QP', 'Quantum Physics'), ('Phys:SM', 'Statistical and Soft Matter Physics'))), ('Astrophysics', (('Astro:GA', 'Astrophysics of Galaxies'), ('Astro:CO', 'Cosmology and Nongalactic Astrophysics'), ('Astro:EP', 'Earth and Planetary Astrophysics'), ('Astro:HE', 'High Energy Astrophysical Phenomena'), ('Astro:IM', 'Instrumentation and Methods for Astrophysics'), ('Astro:SR', 'Solar and Stellar Astrophysics'))), ('Mathematics', (('Math:AG', 'Algebraic Geometry'), ('Math:AT', 'Algebraic Topology'), ('Math:AP', 'Analysis of PDEs'), ('Math:CT', 'Category Theory'), ('Math:CA', 'Classical Analysis and ODEs'), ('Math:CO', 'Combinatorics'), ('Math:AC', 'Commutative Algebra'), ('Math:CV', 'Complex Variables'), ('Math:DG', 'Differential Geometry'), ('Math:DS', 'Dynamical Systems'), ('Math:FA', 'Functional Analysis'), ('Math:GM', 'General Mathematics'), ('Math:GN', 'General Topology'), ('Math:GT', 'Geometric Topology'), ('Math:GR', 'Group Theory'), ('Math:HO', 'History and Overview'), ('Math:IT', 'Information Theory'), ('Math:KT', 'K-Theory and Homology'), ('Math:LO', 'Logic'), ('Math:MP', 'Mathematical Physics'), ('Math:MG', 'Metric Geometry'), ('Math:NT', 'Number Theory'), ('Math:NA', 'Numerical Analysis'), ('Math:OA', 'Operator Algebras'), ('Math:OC', 'Optimization and Control'), ('Math:PR', 'Probability'), ('Math:QA', 'Quantum Algebra'), ('Math:RT', 'Representation Theory'), ('Math:RA', 'Rings and Algebras'), ('Math:SP', 'Spectral Theory'), ('Math:ST', 'Statistics Theory'), ('Math:SG', 'Symplectic Geometry'))), ('Computer Science', (('Comp:AI', 'Artificial Intelligence'), ('Comp:CC', 'Computational Complexity'), ('Comp:CE', 'Computational Engineering, Finance, and Science'), ('Comp:CG', 'Computational Geometry'), ('Comp:GT', 'Computer Science and Game Theory'), ('Comp:CV', 'Computer Vision and Pattern Recognition'), ('Comp:CY', 'Computers and Society'), ('Comp:CR', 'Cryptography and Security'), ('Comp:DS', 'Data Structures and Algorithms'), ('Comp:DB', 'Databases'), ('Comp:DL', 'Digital Libraries'), ('Comp:DM', 'Discrete Mathematics'), ('Comp:DC', 'Distributed, Parallel, and Cluster Computing'), ('Comp:ET', 'Emerging Technologies'), ('Comp:FL', 'Formal Languages and Automata Theory'), ('Comp:GL', 'General Literature'), ('Comp:GR', 'Graphics'), ('Comp:AR', 'Hardware Architecture'), ('Comp:HC', 'Human-Computer Interaction'), ('Comp:IR', 'Information Retrieval'), ('Comp:IT', 'Information Theory'), ('Comp:LG', 'Learning'), ('Comp:LO', 'Logic in Computer Science'), ('Comp:MS', 'Mathematical Software'), ('Comp:MA', 'Multiagent Systems'), ('Comp:MM', 'Multimedia'), ('Comp:NI', 'Networking and Internet Architecture'), ('Comp:NE', 'Neural and Evolutionary Computing'), ('Comp:NA', 'Numerical Analysis'), ('Comp:OS', 'Operating Systems'), ('Comp:OH', 'Other Computer Science'), ('Comp:PF', 'Performance'), ('Comp:PL', 'Programming Languages'), ('Comp:RO', 'Robotics'), ('Comp:SI', 'Social and Information Networks'), ('Comp:SE', 'Software Engineering'), ('Comp:SD', 'Sound'), ('Comp:SC', 'Symbolic Computation'), ('Comp:SY', 'Systems and Control')))], max_length=10), blank=True, null=True, size=None),
+ ),
+ ]
diff --git a/virtualmeetings/models.py b/virtualmeetings/models.py
index 6365bc4b5557f533e0cadf1a8f9de473ac090373..5a69d9f05b4d1d372ec879b51825fceae8d6755e 100644
--- a/virtualmeetings/models.py
+++ b/virtualmeetings/models.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/templates/virtualmeetings/VGM_detail.html b/virtualmeetings/templates/virtualmeetings/VGM_detail.html
index 79aeb72bea91c99b67f8d9ed5fd56004ed148033..62fcc8b913637e09d6c6570c96945a5caaea9d61 100644
--- a/virtualmeetings/templates/virtualmeetings/VGM_detail.html
+++ b/virtualmeetings/templates/virtualmeetings/VGM_detail.html
@@ -20,7 +20,9 @@
<ul>
<li><a href="#Information">Information message</a></li>
<li><a href="#Feedback">Feedback</a></li>
+ {% if VGM.start_date|date:"Y" == '2017' or VGM.start_date|date:"Y" == '2018' %}
<li><a href="#Nominations">Nominations</a></li>
+ {% endif %}
<li><a href="#Motions">Motions</a></li>
</ul>
</div>
@@ -37,7 +39,7 @@
<ul>
<li>This VGM is scheduled from {{ VGM.start_date|date:'Y-m-d' }} to {{ VGM.end_date|date:'Y-m-d' }}.</li>
<li>Your feedback/suggestions/criticisms on any aspect of SciPost are greatly valued. Provide them by filling the <a href="#FeedbackBox">feedback form</a>.</li>
- <li>Your nominations to the Editorial College are welcome. Simply fill the <a href="#NominationBox">nomination form</a>, and cast your vote on current nominations.</li>
+ <li>Your nominations to the Editorial College are welcome. Simply visit the <a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships</a> page, and cast your vote on current nominations.</li>
<li>For substantial changes, for example to the by-laws, new Motions can be put forward until the end of the meeting using the <a href="#MotionBox">form</a>.</li>
<li>Voting on Motions is open until one week after the meeting.</li>
<li>You a referred to the <a href="{% url 'scipost:EdCol_by-laws' %}">by-laws</a>, section 2 for further details about the procedures.</li>
@@ -97,6 +99,8 @@
<hr>
+
+{% if VGM.start_date|date:"Y" == '2017' or VGM.start_date|date:"Y" == '2018' %}
<div class="row" id="Nominations">
<div class="col-12">
<div id="NominationBox">
@@ -233,7 +237,7 @@
{% endfor %}
</div>
</div>
-
+{% endif %}
<!-- Motions -->
<div class="row" id="Motions">
diff --git a/virtualmeetings/templates/virtualmeetings/motion_content.html b/virtualmeetings/templates/virtualmeetings/motion_content.html
index dcc7acc48f9527db37fd68b4701059743bd5769c..b6556ad5cd3ae64c10477f9b2faf903951fecff7 100644
--- a/virtualmeetings/templates/virtualmeetings/motion_content.html
+++ b/virtualmeetings/templates/virtualmeetings/motion_content.html
@@ -3,7 +3,11 @@
<h3 class="pt-0 mb-2">put forward on {{ motion.date|date:"Y-m-d" }} by {{ motion.put_forward_by.user.first_name }} {{ motion.put_forward_by.user.last_name }}</h3>
<h3>Background:</h3>
+ {% if motion.put_forward_by.user.is_superuser %}
+ <div>{{ motion.background|safe|linebreaks }}</div>
+ {% else %}
<div>{{ motion.background|linebreaks }}</div>
+ {% endif %}
<h3>Motion:</h3>
<div>{{ motion.motion|linebreaks }}</div>
diff --git a/virtualmeetings/tests.py b/virtualmeetings/tests.py
index 9135c42ab26e15b71fd25dc25d9f92bcec7e676b..ddef03c4df91383dfce15a034976e3a469d77d70 100644
--- a/virtualmeetings/tests.py
+++ b/virtualmeetings/tests.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/urls.py b/virtualmeetings/urls.py
index 0ada961a44ae9ff41e8aed5e5b67ac19684f77b5..5591f1b911bab054f86964b5b6818b9a0ecd2c4d 100644
--- a/virtualmeetings/urls.py
+++ b/virtualmeetings/urls.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
diff --git a/virtualmeetings/views.py b/virtualmeetings/views.py
index f3fbbc8c81af1c3b33064474cee2eddca10a4a9b..b2d145047409550ab01e538b13bf720cc5a98483 100644
--- a/virtualmeetings/views.py
+++ b/virtualmeetings/views.py
@@ -1,4 +1,4 @@
-__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"