diff --git a/frontend/templates/claim.html b/frontend/templates/claim.html index 2bdc4ce2..9ff84225 100644 --- a/frontend/templates/claim.html +++ b/frontend/templates/claim.html @@ -44,6 +44,6 @@ {% endif %} {% else %} -Please find a work to claim. +It appears you have reached this page in the wrong context. Please see information for rights holders. {% endif %} {% endblock %} \ No newline at end of file diff --git a/frontend/views/rh_views.py b/frontend/views/rh_views.py index 02e5990f..03410506 100644 --- a/frontend/views/rh_views.py +++ b/frontend/views/rh_views.py @@ -1,5 +1,6 @@ from datetime import timedelta from decimal import Decimal as D +import logging from django.conf import settings from django.core.urlresolvers import reverse, reverse_lazy @@ -23,6 +24,8 @@ from regluit.frontend.forms import ( ) from regluit.utils.localdatetime import date_today +logger = logging.getLogger(__name__) + class RHAgree(CreateView): template_name = "rh_agree.html" form_class = RightsHolderForm @@ -74,7 +77,7 @@ class ClaimView(CreateView): return UserClaimForm(self.request.user, data=self.request.POST, prefix='claim') def form_valid(self, form): - print form.cleaned_data + logger.info(form.cleaned_data) work = form.cleaned_data['work'] rights_holder = form.cleaned_data['rights_holder'] if not rights_holder.approved: @@ -88,9 +91,10 @@ class ClaimView(CreateView): return HttpResponseRedirect(reverse('rightsholders')) def get_context_data(self, form): - if not form.is_valid(): - return {'form': form} - work = form.cleaned_data['work'] + try: + work = form.cleaned_data['work'] + except AttributeError: + return {} rights_holder = form.cleaned_data['rights_holder'] active_claims = work.claim.exclude(status = 'release') return {