1.1 --- a/src/main/webapp/WEB-INF/jsp/issues-feed.jsp Sat Nov 27 12:12:20 2021 +0100
1.2 +++ b/src/main/webapp/WEB-INF/jsp/issues-feed.jsp Sat Nov 27 13:03:57 2021 +0100
1.3 @@ -27,34 +27,50 @@
1.4 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.5 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.IssueFeed" scope="request"/>
1.6 <channel>
1.7 - <title><c:out value="${viewmodel.project.name}"/> | <fmt:message key="feed.issues.title"/></title>
1.8 + <title>
1.9 + <c:out value="${viewmodel.project.name}"/>
1.10 + |<fmt:message key="feed.issues.title"/></title>
1.11 <description><fmt:message key="feed.issues.description"/></description>
1.12 <link>${baseHref}projects/${viewmodel.project.node}</link>
1.13 <language>${pageContext.response.locale.language}</language>
1.14 - <pubDate><fmt:formatDate value="${viewmodel.lastModified}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate>
1.15 - <lastBuildDate><fmt:formatDate value="${viewmodel.lastModified}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></lastBuildDate>
1.16 + <pubDate><fmt:formatDate value="${viewmodel.lastModified}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz"/></pubDate>
1.17 + <lastBuildDate><fmt:formatDate value="${viewmodel.lastModified}"
1.18 + pattern="EEE, dd MMM yyyy HH:mm:ss zzz"/></lastBuildDate>
1.19
1.20 <c:forEach items="${viewmodel.entries}" var="entry">
1.21 - <c:set var="issue" value="${entry.issue}"/>
1.22 <item>
1.23 - <title>[<fmt:message key="feed.issues.type.${entry.type}"/>] #${issue.id} - <c:out value="${issue.currentSubject}"/></title>
1.24 - <description><![CDATA[
1.25 - <h1>#${issue.id} - ${issue.subject}</h1>
1.26 - <div><b><fmt:message key="component"/></b>: ${issue.component}</div>
1.27 - <div><b><fmt:message key="issue.category"/></b>: ${issue.category}</div>
1.28 - <div><b><fmt:message key="issue.status"/></b>: ${issue.status}</div>
1.29 - <div><b><fmt:message key="issue.resolved-versions"/></b>: ${issue.resolved}</div>
1.30 - <div><b><fmt:message key="issue.affected-versions"/></b>: ${issue.affected}</div>
1.31 - <div><b><fmt:message key="issue.assignee"/></b>: ${issue.assignee}</div>
1.32 - <div><b><fmt:message key="issue.eta"/></b>: ${issue.eta}</div>
1.33 - <h2><fmt:message key="issue.description"/></h2>
1.34 - <div style="white-space: pre-wrap;">${issue.description}</div>
1.35 - ]]></description>
1.36 - <category><fmt:message key="issue.category.${issue.category}"/></category>
1.37 - <c:set var="link" value="${baseHref}projects/${viewmodel.project.node}/issues/-/-/${issue.id}"/>
1.38 + <c:choose>
1.39 + <c:when test="${not empty entry.issue}">
1.40 + <c:set var="issue" value="${entry.issue}"/>
1.41 + <c:set var="link" value="${baseHref}projects/${viewmodel.project.node}/issues/-/-/${issue.id}"/>
1.42 + <title>[<fmt:message key="feed.issues.type.${entry.type}"/>] #${issue.id} - <c:out value="${issue.currentSubject}"/></title>
1.43 + <description><![CDATA[
1.44 + <h1>#${issue.id} - ${issue.subject}</h1>
1.45 + <div><b><fmt:message key="component"/></b>: ${issue.component}</div>
1.46 + <div><b><fmt:message key="issue.category"/></b>: ${issue.category}</div>
1.47 + <div><b><fmt:message key="issue.status"/></b>: ${issue.status}</div>
1.48 + <div><b><fmt:message key="issue.resolved-versions"/></b>: ${issue.resolved}</div>
1.49 + <div><b><fmt:message key="issue.affected-versions"/></b>: ${issue.affected}</div>
1.50 + <div><b><fmt:message key="issue.assignee"/></b>: ${issue.assignee}</div>
1.51 + <div><b><fmt:message key="issue.eta"/></b>: ${issue.eta}</div>
1.52 + <h2><fmt:message key="issue.description"/></h2>
1.53 + <div style="white-space: pre-wrap;">${issue.description}</div>
1.54 + ]]></description>
1.55 + <category><fmt:message key="issue.category.${issue.category}"/></category>
1.56 + </c:when>
1.57 + <c:when test="${not empty entry.comment}">
1.58 + <c:set var="comment" value="${entry.comment}"/>
1.59 + <c:set var="link" value="${baseHref}projects/${viewmodel.project.node}/issues/-/-/${comment.issueid}"/>
1.60 + <title>[<fmt:message key="feed.issues.type.${entry.type}"/>] #${comment.issueid} - <c:out value="${comment.currentSubject}"/></title>
1.61 + <description><![CDATA[
1.62 + <div style="white-space: pre-wrap;">${comment.comment}</div>
1.63 + ]]></description>
1.64 + <category><fmt:message key="feed.issues.type.${entry.type}"/></category>
1.65 + </c:when>
1.66 + </c:choose>
1.67 <link>${link}</link>
1.68 <guid isPermaLink="true">${link}</guid>
1.69 - <pubDate><fmt:formatDate value="${entry.time}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz" /></pubDate>
1.70 + <pubDate><fmt:formatDate value="${entry.time}" pattern="EEE, dd MMM yyyy HH:mm:ss zzz"/></pubDate>
1.71 </item>
1.72 </c:forEach>
1.73 </channel>
