Commit 16b2e87d authored by Guus der Kinderen's avatar Guus der Kinderen

OF-35: Fix for PEP console pages.

parent 564077e2
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
pageContext.setAttribute("csrf", csrfParam); pageContext.setAttribute("csrf", csrfParam);
pageContext.setAttribute("node", node); pageContext.setAttribute("node", node);
pageContext.setAttribute("owner", owner );
%> %>
<html> <html>
...@@ -194,9 +194,7 @@ ...@@ -194,9 +194,7 @@
<c:param name="nodeID" value="${node.getNodeID()}" /> <c:param name="nodeID" value="${node.getNodeID()}" />
<c:param name="deleteID" value="${item.getID()}" /> <c:param name="deleteID" value="${item.getID()}" />
<c:param name="csrf" value="${csrf}" /> <c:param name="csrf" value="${csrf}" />
<c:if test="${not empty owner}"> <c:param name="owner" value="${not empty owner ? admin:urlEncode(owner) : ''}"/>
<c:param name="owner">${admin:urlEncode(owner)}</c:param>
</c:if>
</c:url> </c:url>
<a href="${url}" title="<fmt:message key="global.click_delete" />"> <a href="${url}" title="<fmt:message key="global.click_delete" />">
<img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""> <img src="images/delete-16x16.gif" width="16" height="16" border="0" alt="">
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
pageContext.setAttribute("csrf", csrfParam); pageContext.setAttribute("csrf", csrfParam);
pageContext.setAttribute("node", node); pageContext.setAttribute("node", node);
pageContext.setAttribute("owner", owner );
%> %>
<html> <html>
...@@ -190,9 +190,7 @@ ...@@ -190,9 +190,7 @@
<c:param name="nodeID" value="${node.getNodeID()}" /> <c:param name="nodeID" value="${node.getNodeID()}" />
<c:param name="deleteID" value="${subscription.getID()}" /> <c:param name="deleteID" value="${subscription.getID()}" />
<c:param name="csrf" value="${csrf}" /> <c:param name="csrf" value="${csrf}" />
<c:if test="${not empty owner}"> <c:param name="owner" value="${not empty owner ? admin:urlEncode(owner) : ''}"/>
<c:param name="owner">${admin:urlEncode(owner)}</c:param>
</c:if>
</c:url> </c:url>
<a href="${url}" title="<fmt:message key="global.click_delete" />"> <a href="${url}" title="<fmt:message key="global.click_delete" />">
<img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""> <img src="images/delete-16x16.gif" width="16" height="16" border="0" alt="">
......
...@@ -148,9 +148,7 @@ ...@@ -148,9 +148,7 @@
<c:forEach begin="1" end="${numPages}" varStatus="loop"> <c:forEach begin="1" end="${numPages}" varStatus="loop">
<c:url value="pubsub-node-summary.jsp" var="url"> <c:url value="pubsub-node-summary.jsp" var="url">
<c:param name="start" value="${(loop.index-1)*range}" /> <c:param name="start" value="${(loop.index-1)*range}" />
<c:if test="${not empty owner}"> <c:param name="owner" value="${not empty owner ? admin:urlEncode(owner) : ''}"/>
<c:param name="owner">${admin:urlEncode(owner)}</c:param>
</c:if>
</c:url> </c:url>
<a href="${url}" class="${ loop.index == curPage ? 'jive-current' : ''}"> <a href="${url}" class="${ loop.index == curPage ? 'jive-current' : ''}">
<c:out value="${loop.index}"/> <c:out value="${loop.index}"/>
...@@ -204,6 +202,7 @@ ...@@ -204,6 +202,7 @@
<td width="1%" align="center"> <td width="1%" align="center">
<c:url value="pubsub-node-items.jsp" var="url"> <c:url value="pubsub-node-items.jsp" var="url">
<c:param name="nodeID" value="${node.getNodeID()}" /> <c:param name="nodeID" value="${node.getNodeID()}" />
<c:param name="owner" value="${not empty owner ? admin:urlEncode(owner) : ''}" />
</c:url> </c:url>
<a href="${url}"> <a href="${url}">
<c:out value="${node.getPublishedItems().size()}" /> <c:out value="${node.getPublishedItems().size()}" />
...@@ -212,6 +211,7 @@ ...@@ -212,6 +211,7 @@
<td width="1%" align="center"> <td width="1%" align="center">
<c:url value="pubsub-node-subscribers.jsp" var="url"> <c:url value="pubsub-node-subscribers.jsp" var="url">
<c:param name="nodeID" value="${node.getNodeID()}" /> <c:param name="nodeID" value="${node.getNodeID()}" />
<c:param name="owner" value="${not empty owner ? admin:urlEncode(owner) : ''}" />
</c:url> </c:url>
<a href="${url}"> <a href="${url}">
<c:out value="${node.getAllSubscriptions().size()}" /> <c:out value="${node.getAllSubscriptions().size()}" />
...@@ -220,6 +220,7 @@ ...@@ -220,6 +220,7 @@
<td width="1%" align="center" style="border-right:1px #ccc solid;"> <td width="1%" align="center" style="border-right:1px #ccc solid;">
<c:url value="pubsub-node-delete.jsp" var="url"> <c:url value="pubsub-node-delete.jsp" var="url">
<c:param name="nodeID" value="${node.getNodeID()}" /> <c:param name="nodeID" value="${node.getNodeID()}" />
<c:param name="owner" value="${not empty owner ? admin:urlEncode(owner) : ''}" />
</c:url> </c:url>
<a href="${url}" title="<fmt:message key="global.click_delete" />"> <a href="${url}" title="<fmt:message key="global.click_delete" />">
<img src="images/delete-16x16.gif" width="16" height="16" border="0" alt=""> <img src="images/delete-16x16.gif" width="16" height="16" border="0" alt="">
...@@ -240,6 +241,7 @@ ...@@ -240,6 +241,7 @@
<c:forEach begin="1" end="${numPages}" varStatus="loop"> <c:forEach begin="1" end="${numPages}" varStatus="loop">
<c:url value="pubsub-node-summary.jsp" var="url"> <c:url value="pubsub-node-summary.jsp" var="url">
<c:param name="start" value="${(loop.index-1)*range}" /> <c:param name="start" value="${(loop.index-1)*range}" />
<c:param name="owner" value="${not empty owner ? admin:urlEncode(owner) : ''}" />
</c:url> </c:url>
<a href="${url}" class="${ loop.index == curPage ? 'jive-current' : ''}"> <a href="${url}" class="${ loop.index == curPage ? 'jive-current' : ''}">
<c:out value="${loop.index}"/> <c:out value="${loop.index}"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment