diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-06-25 11:29:17 +0200 |
|---|---|---|
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-06-25 11:38:02 +0200 |
| commit | 91e6b5cb2f3d531ce40cd0331e2261d30766de47 (patch) | |
| tree | 1b901e6000b44569123a51fd2dd2aa371d92f443 /web/html/pkgbase.php | |
| parent | 959c61a77dd6a41bf82cc12b5eb873c9cfb0ffb8 (diff) | |
| download | aur-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/pkgbase.php')
| -rw-r--r-- | web/html/pkgbase.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index da88210b..0b0f6ef9 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -97,7 +97,7 @@ if (check_token()) { } elseif (current_action("do_ChangeCategory")) { list($ret, $output) = pkgbase_change_category($base_id, $atype); } elseif (current_action("do_FileRequest")) { - list($ret, $output) = pkgbase_file_request($ids, $_POST['type'], $_POST['comments']); + list($ret, $output) = pkgbase_file_request($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']); } elseif (current_action("do_CloseRequest")) { list($ret, $output) = pkgbase_close_request($_POST['reqid']); } |