git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
widget/reply: identify subject changes
[minimedit.git]
/
widget
/
issue
/
activity.php
diff --git
a/widget/issue/activity.php
b/widget/issue/activity.php
index 7829f93c0a5160ed3f4d2ac4a94c524ef10fa996..cd99e486916af3e58e888fdc1ed6080fd226a9de 100644
(file)
--- a/
widget/issue/activity.php
+++ b/
widget/issue/activity.php
@@
-3,25
+3,33
@@
global $Db;
require_once 'database.inc.php';
$limit = $Page->place['n'] ?? 50;
require_once 'database.inc.php';
$limit = $Page->place['n'] ?? 50;
-$cols = 'm.*, i.subject, i.closed';
+$cols = 'm.*, i.subject, i.
updated, i.
closed';
$sql = "SELECT $cols FROM messages m JOIN issues i ON i.id = issue";
$sql = "SELECT $cols FROM messages m JOIN issues i ON i.id = issue";
+$sql .= " WHERE message IS NOT NULL";
$sql .= " ORDER BY m.created DESC LIMIT $limit";
$sql .= " ORDER BY m.created DESC LIMIT $limit";
+$sql = "SELECT * FROM ($sql) x ORDER BY updated DESC, created, id"; # grouped issues
$query = $Db->query($sql);
$query = $Db->query($sql);
-print '<
u
l class="replies">';
+print '<
d
l class="replies">';
+$group = NULL;
while ($row = $query->fetch()) {
$rowuser = new User("profile/{$row->author}");
while ($row = $query->fetch()) {
$rowuser = new User("profile/{$row->author}");
- print '<li>';
+ if ($group !== $row->issue) {
+ $group = $row->issue;
+ print '<dt>';
+ printf('<a href="/%s">%s</a>', $row->page, $row->subject);
+ if ($row->closed) {
+ print ' <em>(opgelost)</em>';
+ }
+ print '</dt>';
+ }
+ print '<dd>';
printf('<strong>%s</strong> <small class="date">%s</small>',
$rowuser->html, showdate(preg_split('/\D/', $row->created))
);
printf('<strong>%s</strong> <small class="date">%s</small>',
$rowuser->html, showdate(preg_split('/\D/', $row->created))
);
- printf("\n\t".'<a href="/%s">%s</a>', $row->page, $row->subject);
- if ($row->closed) {
- print ' <em>(opgelost)</em>';
- }
printf("\n\t<blockquote>%s</blockquote>", $row->message);
printf("\n\t<blockquote>%s</blockquote>", $row->message);
- print "</
li
>\n";
+ print "</
dd
>\n";
}
}
-print "</
u
l>\n";
+print "</
d
l>\n";