From bb9d589fb55718db6783a236d047614b284d352e Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Fri, 23 Mar 2018 19:49:57 +0000
Subject: Add EditRequest approval and rejection

---
 app/templates/packages/editrequest_view.html | 15 +++++++++++++++
 app/templates/packages/view.html             |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'app/templates')

diff --git a/app/templates/packages/editrequest_view.html b/app/templates/packages/editrequest_view.html
index b7abbbe..22b60ae 100644
--- a/app/templates/packages/editrequest_view.html
+++ b/app/templates/packages/editrequest_view.html
@@ -16,6 +16,21 @@
 			<i>No description given</i>
 		{% endif %}
 	</p>
+	{% if request.status == 1 %}
+		<div class="box box_grey alert alert-success">
+			This edit request was merged.
+		</div>
+	{% elif request.status == 2 %}
+		<div class="box  box_grey alert alert-error">
+			This edit request was rejected.
+		</div>
+	{% elif package.checkPerm(current_user, "APPROVE_CHANGES") %}
+		<div class="box box_grey">
+			To resolve this request, either
+			<a href="{{ request.getApproveURL() }}">Approve and Apply</a> or
+			<a href="{{ request.getRejectURL() }}">Reject</a> it.
+		</div>
+	{% endif %}
 
 	<table>
 		<tr>
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index 9ed7def..2ed3a32 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -87,11 +87,11 @@
 		{% endfor %}
 	</ul>
 
-	{% if current_user.is_authenticated or package.requests %}
+	{% if current_user.is_authenticated or requests %}
 		<h3>Edit Requests</h3>
 
 		<ul>
-			{% for r in package.requests %}
+			{% for r in requests %}
 				<li>
 					<a href="{{ r.getURL() }}">{{ r.title }}</a>
 					by
-- 
cgit v1.2.3