From 752c5a6e3483b2309e4b48943adce2625a9bc716 Mon Sep 17 00:00:00 2001
From: canyonknight <canyonknight@gmail.com>
Date: Thu, 27 Sep 2012 17:03:50 -0400
Subject: Move package merging to a separate page

Package actions now have a separate box on the package details page. Add
a package merge link in that box.

Link leads to a new page (pkgmerge.php) that can be used to confirm package
merging. A separate page with confirmation is used to avoid CSRFs.

Signed-off-by: canyonknight <canyonknight@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/template/pkg_details.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/template/pkg_details.php')

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index dcc086b..182722d 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -56,6 +56,7 @@ $sources = package_sources($row["ID"]);
 				<?php endif; ?>
 				<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
 				<li><a href="<?= get_pkg_uri($row['Name']) . 'delete/'; ?>"><?= __('Delete Package'); ?></a></li>
+				<li><a href="<?= get_pkg_uri($row['Name']) . 'merge/'; ?>"><?= __('Merge Package'); ?></a></li>
 				<?php endif; ?>
 				<?php endif; ?>
 			</ul>
-- 
cgit v1.2.3-70-g09d2