From 686c1c0280f177ea0c3d165d5782e596ad335c73 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Tue, 12 Nov 2019 13:51:10 +0000
Subject: [PATCH] Reduce actions on skipped reports
---
hypha/apply/projects/models.py | 2 +-
.../application_projects/includes/reports.html | 11 +++++++----
hypha/apply/projects/views/report.py | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hypha/apply/projects/models.py b/hypha/apply/projects/models.py
index f752cb489..66d02a763 100644
--- a/hypha/apply/projects/models.py
+++ b/hypha/apply/projects/models.py
@@ -773,7 +773,7 @@ class Report(models.Model):
@property
def can_submit(self):
- return self.start_date <= timezone.now().date()
+ return self.start_date <= timezone.now().date() and not self.skipped
@property
def submitted_date(self):
diff --git a/hypha/apply/projects/templates/application_projects/includes/reports.html b/hypha/apply/projects/templates/application_projects/includes/reports.html
index 43e6b96f5..89c734be9 100644
--- a/hypha/apply/projects/templates/application_projects/includes/reports.html
+++ b/hypha/apply/projects/templates/application_projects/includes/reports.html
@@ -76,11 +76,14 @@
<span class="data-block__mobile-label">Privacy: </span>{% if report.public %}Public{% else %}Private{% endif %}
</td>
<td class="data-block__links">
- <a class="data-block__action-link" href="{% url "apply:projects:reports:detail" pk=report.pk %}">View</a>
+ {% if not report.skipped %}
+ <a class="data-block__action-link" href="{% url "apply:projects:reports:detail" pk=report.pk %}">View</a>
- {% if request.user.is_apply_staff %}
- <a class="data-block__action-link" href="{% url "apply:projects:reports:edit" pk=report.pk %}">Edit</a>
- {% if report.skipped %}
+ {% if request.user.is_apply_staff %}
+ <a class="data-block__action-link" href="{% url "apply:projects:reports:edit" pk=report.pk %}">Edit</a>
+ {% endif %}
+ {% else %}
+ {% if request.user.is_apply_staff %}
<form action="{% url "apply:projects:reports:skip" pk=report.pk %}" method="post">
{% csrf_token %}
<input type="submit" value="Unskip" class="btn data-block__action-link"></input>
diff --git a/hypha/apply/projects/views/report.py b/hypha/apply/projects/views/report.py
index ae27c9f8c..da0642443 100644
--- a/hypha/apply/projects/views/report.py
+++ b/hypha/apply/projects/views/report.py
@@ -47,7 +47,7 @@ class ReportDetailView(ReportAccessMixin, DetailView):
def dispatch(self, *args, **kwargs):
report = self.get_object()
- if not report.current and not report.skipped:
+ if not report.current or report.skipped:
raise Http404
return super().dispatch(*args, **kwargs)
--
GitLab