Fix/tiny bugs

proposals/templates/proposals/proposal_update_date_start.html

@@ -26,5 +26,5 @@ <h2>{% trans "Startdatum aanpassen" %}</h2>
     <a class="btn btn-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
     <input class="btn btn-primary ms-auto"
            type="submit"
-           value="{% trans 'Startdatum aanpassen' %}" />
+           value="{% trans 'Wijzigingen opslaan' %}" />
 {% endblock %}

proposals/views/attachment_views.py

@@ -1,6 +1,7 @@
 from django.views import generic
 from django import forms
 from django.urls import reverse
+from django.http import Http404
 from django import forms
 from django.conf import settings
 from main.views import UpdateView
@@ -139,7 +140,10 @@ def get_proposal(self):
     def get_owner_object(self):
         owner_class = self.owner_model
         other_pk = self.kwargs.get("other_pk")
-        return owner_class.objects.get(pk=other_pk)
+        try:
+            return owner_class.objects.get(pk=other_pk)
+        except owner_class.DoesNotExist:
+            raise Http404
 
     def get_kind(self):
         kind_str = self.kwargs.get("kind", None)

proposals/views/wmo_views.py

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 from django.urls import reverse
-from django.http import JsonResponse
+from django.http import JsonResponse, Http404
 from django.views import generic
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.translation import gettext_lazy as _
@@ -67,7 +67,10 @@ def form_valid(self, form):
 
     def get_proposal(self):
         """Retrieves the Proposal from the pk kwarg"""
-        return Proposal.objects.get(pk=self.kwargs["pk"])
+        try:
+            return Proposal.objects.get(pk=self.kwargs["pk"])
+        except Proposal.DoesNotExist:
+            raise Http404
 
 
 class WmoUpdate(

studies/forms.py

@@ -124,9 +124,7 @@ def clean(self):
         """
         cleaned_data = super(StudyForm, self).clean()
 
-        self.mark_soft_required(
-            cleaned_data, "compensation", "recruitment", "hierarchy"
-        )
+        self.mark_soft_required(cleaned_data, "compensation", "hierarchy")
 
         self.necessity_required(cleaned_data)
         self.check_dependency(

studies/mixins.py

@@ -1,3 +1,5 @@
+from django.http import Http404
+
 from .models import Study
 from proposals.mixins import StepperContextMixin
 
@@ -16,7 +18,10 @@ class StudyFromURLMixin:
 
     def get_study(self):
         """Retrieves the Study from the pk kwarg"""
-        return Study.objects.get(pk=self.kwargs["pk"])
+        try:
+            return Study.objects.get(pk=self.kwargs["pk"])
+        except Study.DoesNotExist:
+            raise Http404
 
     def get_proposal(
         self,

studies/templates/studies/study_update_attachments.html

@@ -21,5 +21,5 @@ <h2>{% trans "Formulieren aanpassen" %}</h2>
     <a class="btn btn-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
     <input class="btn btn-primary ms-auto"
            type="submit"
-           value="{% trans 'Formulieren aanpassen' %}" />
+           value="{% trans 'Wijzigingen opslaan' %}" />
 {% endblock %}

studies/views/study_views.py

@@ -209,7 +209,7 @@ def form_valid(self, form):
 
     def get_success_url(self):
         """Continue to the URL specified in the 'next' POST parameter"""
-        return self.request.POST.get("next", "/")
+        return reverse("reviews:detail", args=[self.object.proposal.latest_review().pk])
 
 
 ################

tasks/views/task_views.py

@@ -2,7 +2,7 @@
 
 from typing import Any
 from django.urls import reverse
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, Http404
 from django.utils.translation import gettext_lazy as _
 
 from main.views import AllowErrorsOnBackbuttonMixin, UpdateView, DeleteView, CreateView
@@ -64,7 +64,10 @@ def form_valid(self, form):
 
     def get_session(self):
         """Retrieves the Study from the pk kwarg"""
-        return Session.objects.get(pk=self.kwargs["pk"])
+        try:
+            return Session.objects.get(pk=self.kwargs["pk"])
+        except Session.DoesNotExist:
+            raise Http404
 
     def get_proposal(self):
         return self.get_session().study.proposal