diff options
author | canyonknight <canyonknight@gmail.com> | 2012-09-27 17:03:50 -0400 |
---|---|---|
committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2012-09-28 08:57:25 +0200 |
commit | 752c5a6e3483b2309e4b48943adce2625a9bc716 (patch) | |
tree | 418351bf207e460d2951fb719deb7f22a12afbf2 /web/template | |
parent | 00cffd7ddba6bd7b65fcd4c1ce625515cf5489d0 (diff) |
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>
Diffstat (limited to 'web/template')
-rw-r--r-- | web/template/pkg_details.php | 1 |
1 files changed, 1 insertions, 0 deletions
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> |