Author: ate
Date: Thu Nov 1 12:12:02 2012
New Revision: 1404552
URL: http://svn.apache.org/viewvc?rev=1404552&view=rev
Log:
fixing another model-split error (page owner -> ownerId)
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1404552&r1=1404551&r2=1404552&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Thu Nov 1 12:12:02 2012
@@ -160,14 +160,15 @@
<div>
<div id="confirmSharePageLegend">
<c:choose>
- <c:when test="${page.owner.username ==
principleUsername}">
- <fmt:message
key="cloned.page.confirm.message"/>
- </c:when>
- <c:otherwise>
- <fmt:message
key="sharing.page.confirm.message">
- <fmt:param
value="${page.owner.username}"/>
- </fmt:message>
- </c:otherwise>
+ <c:when test="${page.ownerId == principleId}">
+ <fmt:message
key="cloned.page.confirm.message"/>
+ </c:when>
+ <c:otherwise>
+ <portal:person id="${page.ownerId}"
var="owner" />
+ <fmt:message
key="sharing.page.confirm.message">
+ <fmt:param value="${owner.username}"/>
+ </fmt:message>
+ </c:otherwise>
</c:choose>
</div>
</div>
