1.1 --- a/src/main/webapp/WEB-INF/jsp/issues-feed.jsp Sat Oct 09 17:46:12 2021 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/issues-feed.jsp Sat Oct 09 20:05:39 2021 +0200 1.3 @@ -34,21 +34,27 @@ 1.4 <pubDate><fmt:formatDate value="${viewmodel.lastModified}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate> 1.5 <lastBuildDate><fmt:formatDate value="${viewmodel.lastModified}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></lastBuildDate> 1.6 1.7 - <c:forEach items="${viewmodel.issues}" var="issue"> 1.8 + <c:forEach items="${viewmodel.entries}" var="entry"> 1.9 + <c:set var="issue" value="${entry.issue}"/> 1.10 <item> 1.11 - <title><c:if test="${not empty issue.component}"><c:out value="${issue.component.name}"/> - </c:if><c:out value="${issue.subject}"/></title> 1.12 - <description><c:choose> 1.13 - <c:when test="${issue.created eq issue.updated}"> 1.14 - <fmt:message key="feed.issues.created"/> 1.15 - </c:when> 1.16 - <c:otherwise> 1.17 - <fmt:message key="feed.issues.updated"/> 1.18 - </c:otherwise> 1.19 - </c:choose></description> 1.20 + <title>[<fmt:message key="feed.issues.type.${entry.type}"/>] #${issue.id} - <c:out value="${issue.currentSubject}"/></title> 1.21 + <description><![CDATA[ 1.22 + <h1>#${issue.id} - <c:out value="${issue.subject}"/></h1> 1.23 + <div><b><fmt:message key="component"/></b>: ${issue.component}</div> 1.24 + <div><b><fmt:message key="issue.category"/></b>: ${issue.category}</div> 1.25 + <div><b><fmt:message key="issue.status"/></b>: ${issue.status}</div> 1.26 + <div><b><fmt:message key="issue.resolved-versions"/></b>: ${issue.resolved}</div> 1.27 + <div><b><fmt:message key="issue.affected-versions"/></b>: ${issue.affected}</div> 1.28 + <div><b><fmt:message key="issue.assignee"/></b>: ${issue.assignee}</div> 1.29 + <div><b><fmt:message key="issue.eta"/></b>: ${issue.eta}</div> 1.30 + <h2><fmt:message key="issue.description"/></h2> 1.31 + ${issue.description} 1.32 + ]]></description> 1.33 <category><fmt:message key="issue.category.${issue.category}"/></category> 1.34 - <link>${baseHref}projects/${issue.project.node}/issues/-/${empty issue.component ? '-' : issue.component.node}/${issue.id}</link> 1.35 - <guid isPermaLink="true">${baseHref}projects/${issue.project.node}/issues/-/-/${issue.id}</guid> 1.36 - <pubDate><fmt:formatDate value="${issue.updated}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate> 1.37 + <c:set var="link" value="${baseHref}projects/${viewmodel.project.node}/issues/-/-/${issue.id}"/> 1.38 + <link>${link}</link> 1.39 + <guid isPermaLink="true">${link}</guid> 1.40 + <pubDate><fmt:formatDate value="${entry.time}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate> 1.41 </item> 1.42 </c:forEach> 1.43 </channel>