From 8a465182babccec10b8e789dbc871db3beb9bec5 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Fri, 4 Jul 2014 10:40:29 +0200
Subject: Allow for selecting a reason when closing a request

When closing a package request, Trusted Users can now pick a reason
("Accepted" or "Rejected"). This allows for marking a request as
accepted, even if the corresponding package base has already been
deleted.

Also, the notification email now always explicitly states whether a
request has been accepted or closed in the message body.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/template/pkgreq_close_form.php | 24 ++++++++++++++++++++++++
 web/template/pkgreq_results.php    | 14 +++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 web/template/pkgreq_close_form.php

(limited to 'web/template')

diff --git a/web/template/pkgreq_close_form.php b/web/template/pkgreq_close_form.php
new file mode 100644
index 0000000..be36aef
--- /dev/null
+++ b/web/template/pkgreq_close_form.php
@@ -0,0 +1,24 @@
+<div class="box">
+	<h2><?= __('Close Request: %s', htmlspecialchars($pkgbase_name)) ?></h2>
+	<p>
+		<?= __('Use this form to close the request for package base %s%s%s.',
+			'<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
+	</p>
+	<form action="<?= get_uri('/pkgbase/'); ?>" method="post">
+		<fieldset>
+			<input type="hidden" name="reqid" value="<?= $pkgreq_id ?>" />
+			<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
+			<p>
+				<label for="id_reason"><?= __("Reason") ?>:</label>
+				<select name="reason" id="id_reason">
+					<option value="accepted"><?= __('Accepted') ?></option>
+					<option value="rejected"><?= __('Rejected') ?></option>
+				</select>
+			</p>
+			<p>
+				<input type="submit" class="button" name="do_CloseRequest" value="<?= __("Close Request") ?>" />
+			</p>
+		</fieldset>
+	</form>
+</div>
+
diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php
index 9cd6faf..b5e1177 100644
--- a/web/template/pkgreq_results.php
+++ b/web/template/pkgreq_results.php
@@ -51,8 +51,10 @@
 				<?php if ($row['BaseID']): ?>
 				<?php if ($row['Type'] == 'deletion'): ?>
 				<a href="<?= get_pkgbase_uri($row['Name']) ?>delete/?via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a>
+				<br/ >
 				<?php elseif ($row['Type'] == 'merge'): ?>
 				<a href="<?= get_pkgbase_uri($row['Name']) ?>merge/?into=<?= urlencode($row['MergeInto']) ?>&via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a>
+				<br />
 				<?php elseif ($row['Type'] == 'orphan'): ?>
 				<form action="<?= get_pkgbase_uri($row['Name']) . 'disown/'; ?>" method="post">
 					<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
@@ -61,17 +63,7 @@
 				</form>
 				<?php endif; ?>
 				<?php endif; ?>
-				<form action="<?= get_uri('/pkgbase/'); ?>" method="post">
-					<fieldset>
-						<input type="hidden" name="IDs[<?= $row['BaseID'] ?>]" value="1" />
-						<input type="hidden" name="ID" value="<?= $row['BaseID'] ?>" />
-						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
-						<input type="hidden" name="reqid" value="<?= $row['ID'] ?>" />
-						<div>
-							<input type="submit" class="button text-button" name="do_CloseRequest" value="<?= __("Close") ?>" />
-						</div>
-					</fieldset>
-				</form>
+				<a href="<?= get_pkgreq_route() . '/' . intval($row['ID']) ?>/close/"><?= __('Close') ?></a>
 			</td>
 			<?php else: ?>
 			<td><?= __("Closed") ?></td>
-- 
cgit v1.2.3-54-g00ecf