# HG changeset patch
# User Mike Becker <universe@uap-core.de>
# Date 1741462149 -3600
# Node ID b8e6737091a17e78f0e135043905d4be6de47931
# Parent  4aaacbd102ae27f1155fccd4fc7be131a0dba2c7
fix missing project name for comments in global RSS feed

fixes #509

diff -r 4aaacbd102ae -r b8e6737091a1 src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt
--- a/src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt	Fri Mar 07 21:25:29 2025 +0100
+++ b/src/main/kotlin/de/uapcore/lightpit/dao/PostgresDataAccessObject.kt	Sat Mar 08 20:29:09 2025 +0100
@@ -1167,9 +1167,11 @@
     override fun listIssueCommentHistory(project: Project?, days: Int) =
         withStatement(
             """
-                select evt.userid as authorid, u.username as current_assignee, evt.*, evtdata.*
+                select evt.userid as authorid, u.username as current_assignee,
+                       p.name as project_name, evt.*, evtdata.*
                 from lpit_issue_history_event evt
                 join lpit_issue issue using (issueid)
+                join lpit_project p on p.projectid = project
                 left join lpit_user u on u.userid = issue.assignee
                 join lpit_issue_comment_history evtdata using (eventid)
                 where (? or project = ?)
@@ -1186,6 +1188,7 @@
                         author = getInt("authorid").let {
                             if (it > 0) findUser(it) else null
                         },
+                        project = getString("project_name"),
                         subject = getString("subject"),
                         time = getTimestamp("time"),
                         type = getEnum("type"),
diff -r 4aaacbd102ae -r b8e6737091a1 src/main/kotlin/de/uapcore/lightpit/entities/IssueHistoryEntry.kt
--- a/src/main/kotlin/de/uapcore/lightpit/entities/IssueHistoryEntry.kt	Fri Mar 07 21:25:29 2025 +0100
+++ b/src/main/kotlin/de/uapcore/lightpit/entities/IssueHistoryEntry.kt	Sat Mar 08 20:29:09 2025 +0100
@@ -54,6 +54,7 @@
 
 class IssueCommentHistoryEntry(
     val author: User?,
+    val project: String,
     val subject: String,
     val time: Timestamp,
     val type: IssueHistoryType,
diff -r 4aaacbd102ae -r b8e6737091a1 src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt
--- a/src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt	Fri Mar 07 21:25:29 2025 +0100
+++ b/src/main/kotlin/de/uapcore/lightpit/servlet/FeedServlet.kt	Sat Mar 08 20:29:09 2025 +0100
@@ -62,6 +62,7 @@
         CommentDiff(
             data.issueid,
             data.commentid,
+            data.project,
             data.subject,
             data.comment.replace("\r", "")
         )
@@ -70,6 +71,7 @@
         CommentDiff(
             cur.issueid,
             cur.commentid,
+            cur.project,
             cur.subject,
             diffGenerator.generateDiffRows(
                 next.comment.replace("\r", "").split('\n'),
diff -r 4aaacbd102ae -r b8e6737091a1 src/main/kotlin/de/uapcore/lightpit/viewmodel/Feeds.kt
--- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Feeds.kt	Fri Mar 07 21:25:29 2025 +0100
+++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Feeds.kt	Sat Mar 08 20:29:09 2025 +0100
@@ -51,6 +51,7 @@
 class CommentDiff(
     val issueid: Int,
     val id: Int,
+    val project: String,
     val currentSubject: String,
     val comment: String
 )
diff -r 4aaacbd102ae -r b8e6737091a1 src/main/webapp/WEB-INF/changelogs/changelog-de.jspf
--- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Fri Mar 07 21:25:29 2025 +0100
+++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf	Sat Mar 08 20:29:09 2025 +0100
@@ -44,6 +44,7 @@
         falschen Jahr befüllen, wenn sich das Datum in Kalenderwoche 1, aber im Dezember befindet.
     </li>
     <li>Kaputten Seitentitel beim Erstellen von neuen Vorgängen behoben (Regression von Version 1.4.0).</li>
+    <li>Fehlenden Projektnamen bei Kommentareinträgen im globalen RSS-Feed ergänzt.</li>
 </ul>
 
 <h3>Version 1.4.0</h3>
diff -r 4aaacbd102ae -r b8e6737091a1 src/main/webapp/WEB-INF/changelogs/changelog.jspf
--- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Fri Mar 07 21:25:29 2025 +0100
+++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf	Sat Mar 08 20:29:09 2025 +0100
@@ -47,6 +47,7 @@
         the week-year instead of the year for loading an existing date into the form.
     </li>
     <li>Fix broken page title when creating new issues (introduced with version 1.4.0).</li>
+    <li>Fix missing project name in comment entries in the global RSS feed.</li>
 </ul>
 
 <h3>Version 1.4.0</h3>
diff -r 4aaacbd102ae -r b8e6737091a1 src/main/webapp/WEB-INF/jsp/issues-feed.jsp
--- a/src/main/webapp/WEB-INF/jsp/issues-feed.jsp	Fri Mar 07 21:25:29 2025 +0100
+++ b/src/main/webapp/WEB-INF/jsp/issues-feed.jsp	Sat Mar 08 20:29:09 2025 +0100
@@ -70,7 +70,7 @@
                 <c:when test="${not empty entry.comment}">
                     <c:set var="comment" value="${entry.comment}"/>
                     <c:set var="link" value="${issueHref}${comment.issueid}"/>
-                    <title>[<fmt:message key="feed.issues.type.${entry.type}"/>] #${comment.issueid} - <c:out value="${comment.currentSubject}"/></title>
+                    <title>[<fmt:message key="feed.issues.type.${entry.type}"/>] #${comment.issueid} - <c:if test="${empty viewmodel.project}"><c:out value="${comment.project}" /> - </c:if><c:out value="${comment.currentSubject}"/></title>
                     <description><![CDATA[
                         <div style="white-space: pre-wrap;">${comment.comment}</div>
                     ]]></description>