From acf5d3552f1921bb54d3bf0f0aa7aa9f9913e7dc Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 6 Nov 2018 09:48:50 +0100
Subject: [PATCH] Simplify getting parent page by using get_from_parent().
---
opentech/apply/funds/views.py | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index d9161660f..c8a6f2c13 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -25,7 +25,6 @@ from opentech.apply.determinations.views import DeterminationCreateOrUpdateView
from opentech.apply.review.views import ReviewContextMixin
from opentech.apply.users.decorators import staff_required
from opentech.apply.utils.views import DelegateableView, ViewDispatcher
-from opentech.public.funds.models import BaseApplicationPage, LabPage
from .differ import compare
from .forms import ProgressSubmissionForm, UpdateReviewersForm, UpdateSubmissionLeadForm
@@ -149,23 +148,12 @@ class AdminSubmissionDetailView(ReviewContextMixin, ActivityContextMixin, Delega
redirect = SubmissionSealedView.should_redirect(request, submission)
return redirect or super().dispatch(request, *args, **kwargs)
- def get_public_page(self, page_id):
- try:
- return BaseApplicationPage.objects.get(application_type_id=page_id)
- except BaseApplicationPage.DoesNotExist:
- pass
- try:
- return LabPage.objects.get(lab_type_id=page_id)
- except LabPage.DoesNotExist:
- pass
- return False
-
def get_context_data(self, **kwargs):
other_submissions = self.model.objects.filter(user=self.object.user).current().exclude(id=self.object.id)
if self.object.next:
other_submissions = other_submissions.exclude(id=self.object.next.id)
- public_page = self.get_public_page(self.object.page.id)
+ public_page = self.object.get_from_parent('detail')()
return super().get_context_data(
other_submissions=other_submissions,
--
GitLab