diff --git a/partners/migrations/0033_auto_20171003_1512.py b/partners/migrations/0033_auto_20171003_1512.py
new file mode 100644
index 0000000000000000000000000000000000000000..e665732968b38d015b34531e21e2d8262aba9d1f
--- /dev/null
+++ b/partners/migrations/0033_auto_20171003_1512.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-10-03 13:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import partners.storage
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0032_auto_20170829_0727'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='partnersattachment',
+ name='attachment',
+ field=models.FileField(storage=partners.storage.SecureFileStorage(), upload_to='UPLOADS/PARTNERS/ATTACHMENTS'),
+ ),
+ ]
diff --git a/production/migrations/0021_auto_20171003_1512.py b/production/migrations/0021_auto_20171003_1512.py
new file mode 100644
index 0000000000000000000000000000000000000000..259a9b7527ea0d0bdf453ab510d63dd13adee682
--- /dev/null
+++ b/production/migrations/0021_auto_20171003_1512.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-10-03 13:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('production', '0020_auto_20170930_0156'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='productionstream',
+ options={'permissions': (('can_work_for_stream', 'Can work for stream'),)},
+ ),
+ ]
diff --git a/production/migrations/0022_auto_20171003_1525.py b/production/migrations/0022_auto_20171003_1525.py
new file mode 100644
index 0000000000000000000000000000000000000000..50746ff3a864bd9e77886f4b2f700545eec0a4cc
--- /dev/null
+++ b/production/migrations/0022_auto_20171003_1525.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-10-03 13:25
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('production', '0021_auto_20171003_1512'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='productionstream',
+ options={'permissions': (('can_work_for_stream', 'Can work for stream'), ('can_perform_supervisory_actions', 'Can perform supervisory actions'))},
+ ),
+ ]
diff --git a/production/templates/production/partials/production_stream_card.html b/production/templates/production/partials/production_stream_card.html
index f1f88a5687e19c1fa867ca46cb2a9ab95de00372..8550fa1a34c12ee7acc4e8baadc082c9adee69be 100644
--- a/production/templates/production/partials/production_stream_card.html
+++ b/production/templates/production/partials/production_stream_card.html
@@ -9,38 +9,38 @@
<h3>Events</h3>
{% include 'production/partials/production_events.html' with events=stream.events.all %}
- {% if perms.scipost.can_publish_accepted_submission or perms.scipost.can_assign_production_supervisor or "can_perform_supervisory_actions" in sub_perms %}
- <h3>Actions</h3>
- <ul>
- {% if perms.scipost.can_assign_production_supervisor and assign_supervisor_form %}
- <li>
- <a href="javascript:;" data-toggle="toggle" data-target="#add_supervisor_{{stream.id}}">Assign Production Supervisor to this stream</a>
- <div id="add_supervisor_{{stream.id}}" style="display: none;">
- <form class="my-3" action="{% url 'production:add_supervisor' stream_id=stream.id %}" method="post">
- {% csrf_token %}
- {{ assign_supervisor_form|bootstrap_inline }}
- <input type="submit" class="btn btn-outline-primary" name="submit" value="Add officer">
- </form>
- </div>
- </li>
- {% endif %}
- {% if "can_perform_supervisory_actions" in sub_perms and assign_officer_form %}
- <li>
- <a href="javascript:;" data-toggle="toggle" data-target="#add_officer_{{stream.id}}">Assign Production Officer to this stream</a>
- <div id="add_officer_{{stream.id}}" style="display: none;">
- <form class="my-3" action="{% url 'production:add_officer' stream_id=stream.id %}" method="post">
- {% csrf_token %}
- {{ assign_officer_form|bootstrap_inline }}
- <input type="submit" class="btn btn-outline-primary" name="submit" value="Add officer">
- </form>
- </div>
- </li>
- {% endif %}
- {% if perms.scipost.can_publish_accepted_submission %}
- <li><a href="{% url 'production:mark_as_completed' stream_id=stream.id %}">Mark this stream as completed</a></li>
- {% endif %}
- </ul>
- {% endif %}
+ {% if "can_perform_supervisory_actions" in sub_perms %}
+ <h3>Actions</h3>
+ <ul>
+ {% if perms.scipost.can_assign_production_supervisor and assign_supervisor_form %}
+ <li>
+ <a href="javascript:;" data-toggle="toggle" data-target="#add_supervisor_{{stream.id}}">Assign Production Supervisor to this stream</a>
+ <div id="add_supervisor_{{stream.id}}" style="display: none;">
+ <form class="my-3" action="{% url 'production:add_supervisor' stream_id=stream.id %}" method="post">
+ {% csrf_token %}
+ {{ assign_supervisor_form|bootstrap_inline }}
+ <input type="submit" class="btn btn-outline-primary" name="submit" value="Add officer">
+ </form>
+ </div>
+ </li>
+ {% endif %}
+ {% if perms.scipost.can_assign_production_officer and assign_officer_form %}
+ <li>
+ <a href="javascript:;" data-toggle="toggle" data-target="#add_officer_{{stream.id}}">Assign Production Officer to this stream</a>
+ <div id="add_officer_{{stream.id}}" style="display: none;">
+ <form class="my-3" action="{% url 'production:add_officer' stream_id=stream.id %}" method="post">
+ {% csrf_token %}
+ {{ assign_officer_form|bootstrap_inline }}
+ <input type="submit" class="btn btn-outline-primary" name="submit" value="Add officer">
+ </form>
+ </div>
+ </li>
+ {% endif %}
+ {% if perms.scipost.can_publish_accepted_submission %}
+ <li><a href="{% url 'production:mark_as_completed' stream_id=stream.id %}">Mark this stream as completed</a></li>
+ {% endif %}
+ </ul>
+ {% endif %}
{% endblock %}
{% block officers %}
@@ -57,7 +57,7 @@
<li>Production Officer:
{% if stream.officer %}
<strong>{{ stream.officer }}</strong>
- {% if "can_perform_supervisory_actions" in sub_perms %}
+ {% if perms.scipost.can_assign_production_officer and "can_perform_supervisory_actions" in sub_perms %}
· <a href="{% url 'production:remove_officer' stream_id=stream.id officer_id=stream.officer.id %}" class="text-danger">Remove from stream</a>
{% endif %}
{% else %}
diff --git a/production/views.py b/production/views.py
index bcafcdbe0da5502211e0825a37054690ba9f205d..9c86ca0c9f0473030373e175da29151e893829a6 100644
--- a/production/views.py
+++ b/production/views.py
@@ -155,10 +155,10 @@ def add_supervisor(request, stream_id):
form.save()
supervisor = form.cleaned_data.get('supervisor')
assign_perm('can_work_for_stream', supervisor.user, stream)
+ assign_perm('can_perform_supervisory_actions', supervisor.user, stream)
messages.success(request, 'Supervisor {supervisor} has been assigned.'.format(
supervisor=supervisor))
notify_new_stream_assignment(request.user, stream, supervisor.user)
- assign_perm('can_perform_supervisory_actions', supervisor.user, stream)
else:
for key, error in form.errors.items():
messages.warning(request, error[0])
diff --git a/scipost/static/scipost/assets/css/_pool.scss b/scipost/static/scipost/assets/css/_pool.scss
index 5a59e0df5e3c27754ad7f0804bdc167be7f4c14e..dea95e0ced53eeac71f9e825a6ba1c438a7d48eb 100644
--- a/scipost/static/scipost/assets/css/_pool.scss
+++ b/scipost/static/scipost/assets/css/_pool.scss
@@ -23,6 +23,10 @@ $pool-flex-width: calc(100% - 40px);
.card.submission-detail {
position: sticky;
+ position: -webkit-sticky;
+ position: -moz-sticky;
+ position: -ms-sticky;
+ position: -o-sticky;
top: 15px;
}
diff --git a/submissions/signals.py b/submissions/signals.py
index 664ff585d5255a68d32b3ef6c949d79ab58edda3..d14134ba0d4753b025f251d8f2a8ca04cf406460 100644
--- a/submissions/signals.py
+++ b/submissions/signals.py
@@ -45,7 +45,7 @@ def notify_new_referee_invitation(sender, instance, created, **kwargs):
"""
Notify a Referee about a new refereeing invitation.
"""
- if created:
+ if created and instance.referee:
notify.send(sender=sender, recipient=instance.referee.user,
actor=instance.submission.editor_in_charge,
verb=' would like to invite you to referee a Submission.', target=instance)