Merge branch 'sprint-1-winter-2019' into bugfix/statuses-tweaks

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 }}

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="listall"),
     path('<int:pk>/', include([
         path('', SubmissionDetailView.as_view(), name="detail"),
         path('edit/', SubmissionEditView.as_view(), name="edit"),

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'