issue: populate ticket data before reply include

[minimedit.git] / widget / reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 4c7a3045d80ae11c7bf7bd6375214330e09b7ef1..fd01a947f81acb6748fb300b2bac7f00788216ef 100644 (file)
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,24 +2,52 @@
 global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
-print '<h3>Reacties</h3>'."\n";
+$journalcol = [
+       'assign' => 'Toegewezen aan',
+];
 
 if ($_POST) {
+       require_once 'upload.inc.php';
        try {
-               $html = nl2br(htmlspecialchars($_POST['reply']));
-               $html = "<p>$html</p>";
                $query = $Db->set('comments', [
                        'page'    => $Page,
-                       'message' => $html,
+                       'message' => messagehtml($_POST['reply']),
                        'author'  => $User->login,
                ]);
                if (!$query->rowCount()) {
                        throw new Exception('Fout bij opslaan');
                }
+               $newcomment = $Db->dbh->lastInsertId('comments_id_seq');
 
                if (isset($Issue)) {
-                       $row = ['updated' => ['now()']];
-                       $Db->set('issues', $row, ['id = ?', $Issue->id]);
+                       $row = [];
+                       foreach (array_keys($journalcol) as $col) {
+                               if (!isset($_POST[$col])) continue;
+                               $row[$col] = $_POST[$col] ?: NULL;
+                       }
+                       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,
+                                       ]);
+                               }
+                               $Issue = $updated;
+                       }
                }
                $_POST['reply'] = NULL;
        }
@@ -28,7 +56,8 @@ if ($_POST) {
        }
 }
 
-$query = $Db->query('SELECT * FROM comments WHERE page = ? ORDER BY created', [$Page]);
+$cols = '*, (SELECT json_agg(journal.*) FROM journal WHERE comment_id = comments.id) AS journal';
+$query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created", [$Page]);
 
 print '<ul class="replies">';
 
@@ -39,12 +68,53 @@ while ($row = $query->fetch()) {
                $rowuser->html, showdate(preg_split('/\D/', $row->created))
        );
        printf("<blockquote>%s</blockquote>\n", $row->message);
+       if ($changes = json_decode($row->journal)) {
+               print '<ul>';
+               foreach ($changes as $change) {
+                       print '<li>';
+                       if ($change->col == 'closed') {
+                               printf('<em>%s</em>', isset($change->value) ? 'Gesloten' : 'Heropend');
+                       }
+                       else {
+                               printf("<em>%s</em> %s",
+                                       $journalcol[$change->col], sprintf(
+                                               !isset($change->old_value) ? 'gewijzigd naar <q>%2$s</q>' :
+                                               (!isset($change->value) ? 'verwijderd (<strike>%s</strike>)' :
+                                               'gewijzigd van <q>%s</q> naar <q>%s</q>'),
+                                               $change->old_value, $change->value
+                                       )
+                               );
+                       }
+                       print "</li>\n";
+               }
+               print "</ul>\n";
+       }
        print "</li>\n";
 }
 
 if ($User) {
        print '<li>';
        print '<form method="post" action="">';
+       if (isset($Issue) and $User->admin("edit $Page")) {
+               print '<p>';
+               printf(
+                       '<label for="%s">%s:</label> '
+                       . '<input id="%1$s" name="%1$s" value="%s" />'."\n",
+                       'assign',
+                       $journalcol['assign'],
+                       htmlspecialchars($Issue->assign ?? '')
+               );
+               printf(
+                       '<input type="hidden" name="%s" value="" />' .
+                       '<input type="checkbox" id="%1$s" name="%1$s" value="%s"%s />'
+                       . '<label for="%1$s"> %s</label>'."\n",
+                       'status',
+                       'resolved',
+                       isset($Issue->closed) ? ' checked' : '',
+                       'Gesloten'
+               );
+               print "</p>\n";
+       }
        printf('<textarea id="%s" name="%1$s" cols=60 rows=3 placeholder="%s">%s</textarea>'."\n",
                'reply',
                "Bericht van {$User->login}",