From a526c34a3c2bc450d9a70361d5d58db5205e3846 Mon Sep 17 00:00:00 2001
From: Erin Mullaney <erin.mullaney@torchbox.com>
Date: Mon, 21 Jan 2019 11:43:54 -0500
Subject: [PATCH] #822 new submissions/all page without rounds block
---
opentech/apply/funds/templates/funds/submissions.html | 4 +++-
opentech/apply/funds/urls.py | 2 ++
opentech/apply/funds/views.py | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/opentech/apply/funds/templates/funds/submissions.html b/opentech/apply/funds/templates/funds/submissions.html
index 5589b26b2..753f01193 100644
--- a/opentech/apply/funds/templates/funds/submissions.html
+++ b/opentech/apply/funds/templates/funds/submissions.html
@@ -16,7 +16,9 @@
<div class="wrapper wrapper--large wrapper--inner-space-medium">
- {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds %}
+ {% if closed_rounds or open_rounds %}
+ {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds %}
+ {% endif %}
{% block table %}
{{ block.super }}
diff --git a/opentech/apply/funds/urls.py b/opentech/apply/funds/urls.py
index c38bc53d5..1986e412d 100644
--- a/opentech/apply/funds/urls.py
+++ b/opentech/apply/funds/urls.py
@@ -8,6 +8,7 @@ from .views import (
SubmissionDetailView,
SubmissionEditView,
SubmissionListView,
+ SubmissionListAllView,
SubmissionSealedView,
)
from .api_views import SubmissionList, SubmissionDetail
@@ -23,6 +24,7 @@ app_name = 'funds'
submission_urls = ([
path('', SubmissionListView.as_view(), name="list"),
+ path('all/', SubmissionListAllView.as_view(), name="list"),
path('<int:pk>/', include([
path('', SubmissionDetailView.as_view(), name="detail"),
path('edit/', SubmissionEditView.as_view(), name="edit"),
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index a03620a8d..6c72c8b08 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -95,6 +95,10 @@ class SubmissionListView(AllActivityContextMixin, BaseAdminSubmissionsTable):
)
+class SubmissionListAllView(AllActivityContextMixin, BaseAdminSubmissionsTable):
+ template_name = 'funds/submissions.html'
+
+
class SubmissionsByRound(BaseAdminSubmissionsTable):
template_name = 'funds/submissions_by_round.html'
--
GitLab