summaryrefslogtreecommitdiffstats
path: root/web/html/pkgmerge.php
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2014-06-25 11:29:17 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-06-25 11:38:02 +0200
commit91e6b5cb2f3d531ce40cd0331e2261d30766de47 (patch)
tree1b901e6000b44569123a51fd2dd2aa371d92f443 /web/html/pkgmerge.php
parent959c61a77dd6a41bf82cc12b5eb873c9cfb0ffb8 (diff)
downloadaur-91e6b5cb2f3d531ce40cd0331e2261d30766de47.tar.gz
aur-91e6b5cb2f3d531ce40cd0331e2261d30766de47.tar.xz
Add support for merge requests
This adds a new "Merge" category to the list of available request types and also adds a new "Merge into" field that is hidden via JavaScript when "Deletion" or "Orphan" is selected. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web/html/pkgmerge.php')
-rw-r--r--web/html/pkgmerge.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php
index dbc5eac6..ba3f7424 100644
--- a/web/html/pkgmerge.php
+++ b/web/html/pkgmerge.php
@@ -39,8 +39,11 @@ if ($atype == "Trusted User" || $atype == "Developer"): ?>
<input type="hidden" name="IDs[<?= $base_id ?>]" value="1" />
<input type="hidden" name="ID" value="<?= $base_id ?>" />
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
+ <?php if (isset($_GET['via'])): ?>
+ <input type="hidden" name="via" value="<?= intval($_GET['via']) ?>" />
+ <?php endif; ?>
<p><label for="merge_Into" ><?= __("Merge into:") ?></label>
- <input type="text" id="merge_Into" name="merge_Into" /></p>
+ <input type="text" id="merge_Into" name="merge_Into" value="<?= isset($_GET['into']) ? $_GET['into'] : '' ?>" /></p>
<p><input type="checkbox" name="confirm_Delete" value="1" />
<?= __("Confirm package merge") ?></p>
<p><input type="submit" class="button" name="do_Delete" value="<?= __("Merge") ?>" /></p>