diff --git a/opentech/apply/funds/templates/funds/submissions.html b/opentech/apply/funds/templates/funds/submissions.html index 5589b26b28cab66cfed3fdff8db344fdd5eb613e..753f011935564d51a77fb2a1328421c9554cd469 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 c38bc53d54c94d0904aff1c57559062e5c3d5eb3..1986e412d7473348867ee2663e48da114e5e395c 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 a03620a8d15eaf874a0e5613e8a7efddbf57407e..6c72c8b08d5a75e4cd9167bd1a59ba30e4a539f9 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'