summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2015-12-12 18:25:10 +0100
committerLukas Fleischer <lfleischer@archlinux.org>2015-12-13 10:22:58 +0100
commit5931d5ceec133ad1eee33faee96be061e011dacd (patch)
tree9195e3443c36d342b673d9470ee7bd79d4274ec2
parentb8c1cd7cc3270563ef0c4abed930a9f63e1eefce (diff)
downloadaurweb-5931d5ceec133ad1eee33faee96be061e011dacd.tar.xz
Save comment when closing requests
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rw-r--r--schema/aur-schema.sql1
-rw-r--r--upgrading/4.2.0.txt7
-rw-r--r--web/lib/pkgreqfuncs.inc.php3
3 files changed, 10 insertions, 1 deletions
diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql
index 5561278..f99833a 100644
--- a/schema/aur-schema.sql
+++ b/schema/aur-schema.sql
@@ -333,6 +333,7 @@ CREATE TABLE PackageRequests (
MergeBaseName VARCHAR(255) NULL,
UsersID INTEGER UNSIGNED NULL DEFAULT NULL,
Comments TEXT NOT NULL DEFAULT '',
+ ClosureComment TEXT NOT NULL DEFAULT '',
RequestTS BIGINT UNSIGNED NOT NULL DEFAULT 0,
Status TINYINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (ID),
diff --git a/upgrading/4.2.0.txt b/upgrading/4.2.0.txt
index 1450d5e..7482204 100644
--- a/upgrading/4.2.0.txt
+++ b/upgrading/4.2.0.txt
@@ -21,3 +21,10 @@ ALTER TABLE Users MODIFY Email VARCHAR(254) NOT NULL;
----
ALTER TABLE PackageComments ADD COLUMN PinnedTS BIGINT UNSIGNED NOT NULL DEFAULT 0;
----
+
+
+3. Add new column to store the closure comment of package requests:
+
+----
+ALTER TABLE PackageRequests ADD COLUMN ClosureComment TEXT NOT NULL DEFAULT '';
+----
diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php
index 3ea4692..c1a4931 100644
--- a/web/lib/pkgreqfuncs.inc.php
+++ b/web/lib/pkgreqfuncs.inc.php
@@ -227,7 +227,8 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
return array(false, __("Only TUs and developers can close requests."));
}
- $q = "UPDATE PackageRequests SET Status = " . intval($status) . " ";
+ $q = "UPDATE PackageRequests SET Status = " . intval($status) . ", ";
+ $q.= "ClosureComment = " . $dbh->quote($comments) . " ";
$q.= "WHERE ID = " . intval($id);
$dbh->exec($q);