From 015abe5a2507ad02273bc89953016c386aae4457 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Thu, 14 Nov 2019 23:38:55 +0000
Subject: Indicate stuck releases in todo list and allow admins to delete them

---
 app/templates/admin/list.html | 3 ++-
 app/templates/todo/list.html  | 3 +++
 app/views/admin/admin.py      | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/templates/admin/list.html b/app/templates/admin/list.html
index 4e2d70f..ddfa30c 100644
--- a/app/templates/admin/list.html
+++ b/app/templates/admin/list.html
@@ -19,7 +19,8 @@
 		<form method="post" action="" class="card-body">
 			<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
 			<select name="action">
-				<option value="importmodlist" selected>Import forum topics</option>
+				<option value="delstuckreleases" selected>Delete stuck releases</option>
+				<option value="importmodlist">Import forum topics</option>
 				<option value="recalcscores">Recalculate package scores</option>
 				<option value="checkusers">Check forum users</option>
 				<option value="importscreenshots">Import screenshots from VCS</option>
diff --git a/app/templates/todo/list.html b/app/templates/todo/list.html
index 3eb3251..2e756af 100644
--- a/app/templates/todo/list.html
+++ b/app/templates/todo/list.html
@@ -42,6 +42,9 @@
 				<ul class="list-group list-group-flush">
 					{% for r in releases %}
 						<li class="list-group-item">
+							{% if r.task_id %}
+								<span class="mr-2 badge badge-warning">Importing</span>
+							{% endif %}
 							<a href="{{ r.getEditURL() }}">{{ r.title }}</a>
 							on
 							<a href="{{ r.package.getDetailsURL() }}">
diff --git a/app/views/admin/admin.py b/app/views/admin/admin.py
index b2b615d..b359700 100644
--- a/app/views/admin/admin.py
+++ b/app/views/admin/admin.py
@@ -33,7 +33,11 @@ import datetime
 def admin_page():
 	if request.method == "POST":
 		action = request.form["action"]
-		if action == "importmodlist":
+		if action == "delstuckreleases":
+			PackageRelease.query.filter(PackageRelease.task_id != None).delete()
+			db.session.commit()
+			return redirect(url_for("admin_page"))
+		elif action == "importmodlist":
 			task = importTopicList.delay()
 			return redirect(url_for("check_task", id=task.id, r=url_for("todo_topics_page")))
 		elif action == "checkusers":
-- 
cgit v1.2.3