Merge branch 'master' into development

SciPost_v1/settings/staging.py

@@ -26,3 +26,6 @@ LOGGING['handlers']['scipost_file_doi']['filename'] = '/home/scipoststg/webapps/
 SESSION_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = True
 
+# Email
+EMAIL_BACKEND = 'mails.backends.filebased.ModelEmailBackend'
+EMAIL_BACKEND_ORIGINAL = 'django.core.mail.backends.dummy.EmailBackend'  # Disable real processing

invitations/urls.py

@@ -8,7 +8,7 @@ from . import views
 
 urlpatterns = [
     url(r'^$', views.RegistrationInvitationsView.as_view(), name='list'),
-    url(r'^sent$', views.RegistrationInvitationsSentView.as_view(), name='list_sent'),
+    url(r'^sent$', views.RegistrationInvitationsSendView.as_view(), name='list_sent'),
     url(r'^fellows$', views.RegistrationInvitationsFellowView.as_view(), name='list_fellows'),
     url(r'^new$', views.create_registration_invitation_or_citation, name='new'),
     url(r'^(?P<pk>[0-9]+)/$', views.RegistrationInvitationsUpdateView.as_view(), name='update'),

invitations/views.py

@@ -44,8 +44,8 @@ class RegistrationInvitationsView(PaginationMixin, PermissionsMixin, ListView):
         return context
 
 
-class RegistrationInvitationsSentView(RegistrationInvitationsView):
-    permission_required = 'scipost.can_create_registration_invitations'
+class RegistrationInvitationsSendView(RegistrationInvitationsView):
+    permission_required = 'scipost.can_manage_registration_invitations'
     queryset = RegistrationInvitation.objects.sent().not_for_fellows()
     template_name = 'invitations/registrationinvitation_list_sent.html'
 
@@ -55,6 +55,7 @@ class RegistrationInvitationsFellowView(RegistrationInvitationsView):
     queryset = RegistrationInvitation.objects.no_response().for_fellows()
     template_name = 'invitations/registrationinvitation_list_fellows.html'
 
+
 class CitationNotificationsView(PermissionsMixin, ListView):
     permission_required = 'scipost.can_manage_registration_invitations'
     queryset = CitationNotification.objects.unprocessed().prefetch_related(