diff --git a/commentaries/forms.py b/commentaries/forms.py index 30fecc3ebc316771778cbe9994962e7f59905c04..31c4489139508a2f301a51b3ddaa52270d411c85 100644 --- a/commentaries/forms.py +++ b/commentaries/forms.py @@ -20,7 +20,7 @@ class DOIToQueryForm(forms.Form): VALID_DOI_REGEXP = r'^(?i)10.\d{4,9}/[-._;()/:A-Z0-9]+$' doi = forms.RegexField(regex=VALID_DOI_REGEXP, strip=True, help_text=strings.doi_query_help_text, - error_messxages={'invalid': strings.doi_query_invalid}, + error_messages={'invalid': strings.doi_query_invalid}, widget=forms.TextInput({ 'label': 'DOI', 'placeholder': strings.doi_query_placeholder diff --git a/commentaries/views.py b/commentaries/views.py index e95b4915ee1258132f8191a5831b01c3e7e110f2..acc1a785cc352b03ac37d5e6472ff9b12a2d44f2 100644 --- a/commentaries/views.py +++ b/commentaries/views.py @@ -1,28 +1,22 @@ -import re -import requests - from django.shortcuts import get_object_or_404, render from django.contrib import messages from django.contrib.auth.decorators import permission_required -from django.contrib.auth.mixins import LoginRequiredMixin from django.core.mail import EmailMessage from django.core.urlresolvers import reverse, reverse_lazy from django.db.models import Q -from django.shortcuts import redirect from django.template.loader import render_to_string -from django.views.generic.edit import CreateView, FormView +from django.views.generic.edit import CreateView from django.views.generic.list import ListView from django.utils.decorators import method_decorator from django.http import Http404 from .models import Commentary -from .forms import DOIToQueryForm, ArxivQueryForm, VetCommentaryForm, \ - CommentarySearchForm, RequestPublishedArticleForm, RequestArxivPreprintForm +from .forms import DOIToQueryForm, ArxivQueryForm, VetCommentaryForm, RequestCommentaryForm,\ + CommentarySearchForm, RequestPublishedArticleForm, RequestArxivPreprintForm from comments.models import Comment from comments.forms import CommentForm from scipost.models import Contributor -from scipost.services import ArxivCaller import strings @@ -31,6 +25,7 @@ import strings def request_commentary(request): return render(request, 'commentaries/request_commentary.html') + @method_decorator(permission_required( 'scipost.can_request_commentary_pages', raise_exception=True), name='dispatch') class RequestCommentary(CreateView): @@ -111,6 +106,7 @@ def vet_commentary_requests(request): context = {'contributor': contributor, 'commentary_to_vet': commentary_to_vet, 'form': form} return render(request, 'commentaries/vet_commentary_requests.html', context) + @permission_required('scipost.can_vet_commentary_requests', raise_exception=True) def vet_commentary_request_ack(request, commentary_id): if request.method == 'POST':