From 1eaed55bc6d0942f8428a9c015b00503e33aa0cd Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Tue, 25 Dec 2018 15:13:30 +0000
Subject: Add ability to unapprove package from GUI

---
 app/templates/packages/delete.html | 18 ------------------
 app/templates/packages/remove.html | 19 +++++++++++++++++++
 app/templates/packages/view.html   |  4 ++--
 3 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 app/templates/packages/delete.html
 create mode 100644 app/templates/packages/remove.html

(limited to 'app/templates')

diff --git a/app/templates/packages/delete.html b/app/templates/packages/delete.html
deleted file mode 100644
index 96f37f3..0000000
--- a/app/templates/packages/delete.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	Delete | {{ package.title }}
-{% endblock %}
-
-{% block content %}
-	<form method="POST" action="" class="box box_grey ">
-		<h3>Delete Package</h3>
-
-		<div class="box-body">
-			<p>This action can be undone by the admin, but he'll be very annoyed!</p>
-
-			<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-			<input type="submit" value="Delete" class="btn-danger" />
-		</div>
-	</form>
-{% endblock %}
diff --git a/app/templates/packages/remove.html b/app/templates/packages/remove.html
new file mode 100644
index 0000000..fd20637
--- /dev/null
+++ b/app/templates/packages/remove.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block title %}
+	Delete | {{ package.title }}
+{% endblock %}
+
+{% block content %}
+	<form method="POST" action="" class="box box_grey ">
+		<h3>Remove Package</h3>
+
+		<div class="box-body">
+			<p>Deleting a package can be undone by the admin, but he'll be very annoyed!</p>
+
+			<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+			<input type="submit" name="delete" value="Delete" class="btn btn-danger" />
+			<input type="submit" name="unapprove" value="Unapprove" class="btn btn-warning" />
+		</div>
+	</form>
+{% endblock %}
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index 71cbbaf..d97e376 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -130,8 +130,8 @@
 					{# {% if current_user.is_authenticated %}
 						<a class="btn btn-default btn-sm mx-1" href="{{ package.getCreateEditRequestURL() }}">Suggest Changes</a>
 					{% endif %} #}
-					{% if package.checkPerm(current_user, "DELETE_PACKAGE") %}
-						<a class="btn btn-danger btn-sm mx-1" href="{{ package.getDeleteURL() }}">Delete</a>
+					{% if package.checkPerm(current_user, "DELETE_PACKAGE") or package.checkPerm(current_user, "UNAPPROVE_PACKAGE") %}
+						<a class="btn btn-danger btn-sm mx-1" href="{{ package.getRemoveURL() }}">Remove</a>
 					{% endif %}
 					</div>
 
-- 
cgit v1.2.3