From 4a20e8131b08388e864c8da0fb0192a81bbc5d04 Mon Sep 17 00:00:00 2001
From: Vaibhav Mule <vaibhavmule135@gmail.com>
Date: Tue, 12 May 2020 20:32:17 +0530
Subject: [PATCH] don't show draft status in submission table
---
hypha/apply/funds/models/submissions.py | 4 ++++
hypha/apply/funds/views.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hypha/apply/funds/models/submissions.py b/hypha/apply/funds/models/submissions.py
index 741293d6e..31814fd89 100644
--- a/hypha/apply/funds/models/submissions.py
+++ b/hypha/apply/funds/models/submissions.py
@@ -160,6 +160,10 @@ class ApplicationSubmissionQueryset(JSONOrderable):
Sum('value'),
)
+ def exclude_draft(self):
+ # Applications which have the current stage active (have not been progressed)
+ return self.exclude(status='draft')
+
def with_latest_update(self):
activities = self.model.activities.rel.model
latest_activity = activities.objects.filter(submission=OuterRef('id')).select_related('user')
diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py
index 7cd743001..4871ae7c1 100644
--- a/hypha/apply/funds/views.py
+++ b/hypha/apply/funds/views.py
@@ -180,7 +180,7 @@ class BaseAdminSubmissionsTable(SingleTableMixin, FilterView):
return new_kwargs
def get_queryset(self):
- return self.filterset_class._meta.model.objects.current().for_table(self.request.user)
+ return self.filterset_class._meta.model.objects.exclude_draft().current().for_table(self.request.user)
def get_context_data(self, **kwargs):
search_term = self.request.GET.get('query')
@@ -333,7 +333,7 @@ class SubmissionOverviewView(BaseAdminSubmissionsTable):
def get_table_data(self):
limit = 5
- return super().get_table_data().order_by(F('last_update').desc(nulls_last=True))[:limit]
+ return super().get_table_data().exclude(status='draft').order_by(F('last_update').desc(nulls_last=True))[:limit]
def get_context_data(self, **kwargs):
limit = 6
--
GitLab