From 7df1b8cc0f30fda4411018b9b4205c2e50710bb9 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Fri, 12 May 2023 01:06:09 +0100
Subject: [PATCH] Remove old restore method

---
 app/blueprints/admin/admin.py | 12 +-----------
 app/templates/admin/list.html | 29 +----------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/app/blueprints/admin/admin.py b/app/blueprints/admin/admin.py
index eea4d952..1d55d7c2 100644
--- a/app/blueprints/admin/admin.py
+++ b/app/blueprints/admin/admin.py
@@ -30,17 +30,7 @@ from ...models import UserRank, Package, db, PackageState, User, AuditSeverity,
 def admin_page():
 	if request.method == "POST":
 		action = request.form["action"]
-
-		if action == "restore":
-			package = Package.query.get(request.form["package"])
-			if package is None:
-				flash("Unknown package", "danger")
-			else:
-				package.state = PackageState.READY_FOR_REVIEW
-				db.session.commit()
-				return redirect(url_for("admin.admin_page"))
-
-		elif action in actions:
+		if action in actions:
 			ret = actions[action]["func"]()
 			if ret:
 				return ret
diff --git a/app/templates/admin/list.html b/app/templates/admin/list.html
index 83337c96..0b5b9718 100644
--- a/app/templates/admin/list.html
+++ b/app/templates/admin/list.html
@@ -9,6 +9,7 @@
 		<div class="col-md-6">
 			<div class="list-group">
 				<a class="list-group-item list-group-item-action" href="{{ url_for('users.list_all') }}">User list</a>
+				<a class="list-group-item list-group-item-action" href="{{ url_for('admin.restore') }}">Restore package</a>
 				<a class="list-group-item list-group-item-action" href="{{ url_for('admin.tag_list') }}">Tag Editor</a>
 				<a class="list-group-item list-group-item-action" href="{{ url_for('admin.license_list') }}">License Editor</a>
 				<a class="list-group-item list-group-item-action" href="{{ url_for('admin.version_list') }}">Version Editor</a>
@@ -37,34 +38,6 @@
 					</div>
 				</form>
 			</div>
-
-			<div class="card">
-				<h2 class="card-header">Restore Package</h2>
-
-				<form method="post" action="" class="card-body">
-					<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-					<input type="hidden" name="action" value="restore" />
-					<div class="row px-3">
-						<select name="package" class="custom-select col">
-							{% for p in deleted_packages %}
-								<option value={{ p.id }}>{{ p.id}}) {{ p.title }} by {{ p.author.display_name }}</option>
-							{% endfor %}
-						</select>
-						<input type="submit" value="Restore" class="col-sm-auto btn btn-primary ml-2" />
-					</div>
-				</form>
-
-				<form method="post" action="" class="card-body">
-					<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-					<input type="hidden" name="action" value="delremovedpackages" />
-
-					<p>
-						{{ _("Deletion is permanent.") }}
-					</p>
-
-					<input type="submit" value="Delete Removed Packages" class="btn btn-danger" />
-				</form>
-			</div>
 		</div>
 	</div>
 {% endblock %}