From b82bcb0af909404a4dbb3553a1e41ca7dca40372 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Fri, 4 Feb 2022 13:36:26 +0000
Subject: [PATCH] Disable 'Submit for Approval' when release is broken

---
 app/models/packages.py                     |  3 ++-
 app/templates/macros/package_approval.html | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/models/packages.py b/app/models/packages.py
index 67e84e0..8c0e917 100644
--- a/app/models/packages.py
+++ b/app/models/packages.py
@@ -736,7 +736,8 @@ class Package(db.Model):
 			needsScreenshot = \
 				(self.type == self.type.GAME or self.type == self.type.TXP) and \
 					self.screenshots.count() == 0
-			return self.releases.count() > 0 and not needsScreenshot
+
+			return self.releases.filter(PackageRelease.task_id.is_(None)).count() > 0 and not needsScreenshot
 
 		elif state == PackageState.CHANGES_NEEDED:
 			return self.checkPerm(user, Permission.APPROVE_NEW)
diff --git a/app/templates/macros/package_approval.html b/app/templates/macros/package_approval.html
index 5fa3d42..8478590 100644
--- a/app/templates/macros/package_approval.html
+++ b/app/templates/macros/package_approval.html
@@ -14,19 +14,24 @@
 </div>
 
 {% set level = "warning" %}
-{% if package.releases.count() == 0 %}
+{% if package.releases.filter_by(task_id=None).count() == 0 %}
 	{% set message %}
 		{% if package.checkPerm(current_user, "MAKE_RELEASE") %}
 			{% if package.update_config %}
-				<a class="btn btn-sm btn-warning float-right" href="{{ package.getURL("packages.create_release") }}">
-					{{ _("Create first release") }}
+				<a class="btn btn-sm btn-warning float-right" href="{{ package.getURL('packages.create_release') }}">
+					{{ _("Create release") }}
 				</a>
 			{% else %}
-				<a class="btn btn-sm btn-warning float-right" href="{{ package.getURL("packages.setup_releases") }}">
+				<a class="btn btn-sm btn-warning float-right" href="{{ package.getURL('packages.setup_releases') }}">
 					{{ _("Set up releases") }}
 				</a>
 			{% endif %}
-			{{ _("You need to create a release before this package can be approved.") }}
+
+			{% if package.releases.count() == 0 %}
+				{{ _("You need to create a release before this package can be approved.") }}
+			{% else %}
+				{{ _("Release is still importing, or has an error.") }}
+			{% endif %}
 		{% else %}
 			{{ _("A release is required before this package can be approved.") }}
 		{% endif %}