X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/8f05d49e133e9ca27d20bfc3835fc08812a683cb..e2e6d4c1c37aff2e6b50331cb31af9d59536624f:/widget/reply.php?ds=sidebyside
diff --git a/widget/reply.php b/widget/reply.php
index 1071976..9761cf2 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,8 +2,6 @@
global $User, $Db, $Issue;
require_once 'database.inc.php';
-print '
Reacties
'."\n";
-
if ($_POST) {
try {
$html = nl2br(htmlspecialchars($_POST['reply']));
@@ -16,14 +14,36 @@ if ($_POST) {
if (!$query->rowCount()) {
throw new Exception('Fout bij opslaan');
}
+ $newcomment = $Db->dbh->lastInsertId('comments_id_seq');
if (isset($Issue)) {
- $row = ['updated' => ['now()']];
+ $row = [];
foreach (['assign'] as $col) {
if (!isset($_POST[$col])) continue;
$row[$col] = $_POST[$col] ?: NULL;
}
- $Db->set('issues', $row, ['id = ?', $Issue->id]);
+ if (isset($_POST['status'])) {
+ $reset = !empty($_POST['status']);
+ if (isset($Issue->closed) !== $reset) {
+ $row['closed'] = $reset ? ['now()'] : NULL;
+ }
+ }
+ $derived = ['updated' => ['now()']];
+ $filter = ['id = ? RETURNING *', $Issue->id];
+ $subquery = $Db->set('issues', $row + $derived, $filter);
+
+ if ($updated = $subquery->fetch()) {
+ foreach (array_keys($row) as $col) {
+ if ($updated->$col === $Issue->$col) continue; # unaltered
+ $Db->set('journal', [
+ 'comment_id' => $newcomment,
+ 'property' => 'attr',
+ 'col' => $col,
+ 'old_value' => $Issue->$col,
+ 'value' => $updated->$col,
+ ]);
+ }
+ }
}
$_POST['reply'] = NULL;
}
@@ -58,6 +78,15 @@ if ($User) {
'Toegewezen aan',
htmlspecialchars($Issue->assign ?? '')
);
+ printf(
+ '' .
+ ''
+ . ''."\n",
+ 'status',
+ 'resolved',
+ isset($Issue->closed) ? ' checked' : '',
+ 'Gesloten'
+ );
print "\n";
}
printf(''."\n",