Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/issues-feed.jsp	Sat Oct 09 17:46:12 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/issues-feed.jsp	Sat Oct 09 20:05:39 2021 +0200
@@ -34,21 +34,27 @@
     <pubDate><fmt:formatDate value="${viewmodel.lastModified}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate>
     <lastBuildDate><fmt:formatDate value="${viewmodel.lastModified}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></lastBuildDate>
 
-    <c:forEach items="${viewmodel.issues}" var="issue">
+    <c:forEach items="${viewmodel.entries}" var="entry">
+        <c:set var="issue" value="${entry.issue}"/>
         <item>
-            <title><c:if test="${not empty issue.component}"><c:out value="${issue.component.name}"/> - </c:if><c:out value="${issue.subject}"/></title>
-            <description><c:choose>
-                <c:when test="${issue.created eq issue.updated}">
-                    <fmt:message key="feed.issues.created"/>
-                </c:when>
-                <c:otherwise>
-                    <fmt:message key="feed.issues.updated"/>
-                </c:otherwise>
-            </c:choose></description>
+            <title>[<fmt:message key="feed.issues.type.${entry.type}"/>] #${issue.id} - <c:out value="${issue.currentSubject}"/></title>
+            <description><![CDATA[
+                <h1>#${issue.id} - <c:out value="${issue.subject}"/></h1>
+                <div><b><fmt:message key="component"/></b>: ${issue.component}</div>
+                <div><b><fmt:message key="issue.category"/></b>: ${issue.category}</div>
+                <div><b><fmt:message key="issue.status"/></b>: ${issue.status}</div>
+                <div><b><fmt:message key="issue.resolved-versions"/></b>: ${issue.resolved}</div>
+                <div><b><fmt:message key="issue.affected-versions"/></b>: ${issue.affected}</div>
+                <div><b><fmt:message key="issue.assignee"/></b>: ${issue.assignee}</div>
+                <div><b><fmt:message key="issue.eta"/></b>: ${issue.eta}</div>
+                <h2><fmt:message key="issue.description"/></h2>
+                ${issue.description}
+            ]]></description>
             <category><fmt:message key="issue.category.${issue.category}"/></category>
-            <link>${baseHref}projects/${issue.project.node}/issues/-/${empty issue.component ? '-' : issue.component.node}/${issue.id}</link>
-            <guid isPermaLink="true">${baseHref}projects/${issue.project.node}/issues/-/-/${issue.id}</guid>
-            <pubDate><fmt:formatDate value="${issue.updated}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate>
+            <c:set var="link" value="${baseHref}projects/${viewmodel.project.node}/issues/-/-/${issue.id}"/>
+            <link>${link}</link>
+            <guid isPermaLink="true">${link}</guid>
+            <pubDate><fmt:formatDate value="${entry.time}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate>
         </item>
     </c:forEach>
 </channel>