From 91e6b5cb2f3d531ce40cd0331e2261d30766de47 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer
Date: Wed, 25 Jun 2014 11:29:17 +0200
Subject: 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
---
web/html/pkgbase.php | 2 +-
web/html/pkgmerge.php | 5 ++++-
web/html/pkgreq.php | 21 ++++++++++++++++++++-
3 files changed, 25 insertions(+), 3 deletions(-)
(limited to 'web/html')
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']);
}
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"): ?>
+
+
+
-
+
= __("Confirm package merge") ?>
" />
diff --git a/web/html/pkgreq.php b/web/html/pkgreq.php
index 05eeb51b..2b46b02b 100644
--- a/web/html/pkgreq.php
+++ b/web/html/pkgreq.php
@@ -90,11 +90,30 @@ if (!isset($base_id)) {
-
+
+
+
+
+
+
--
cgit v1.2.3-24-g4f1b