Migrated project group notifier page from jstl to struts tags.
git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@1679086 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp b/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
index 23a8666..0c8d25a 100644
--- a/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
+++ b/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
@@ -19,12 +19,11 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
- <h3><s:text name="projectGroupNotifierSummaryComponent.groupNotifiers"><s:param><c:out value="${projectGroup.name}"/></s:param></s:text></h3>
- <c:if test="${not empty projectGroupNotifierSummaries}">
+ <h3><s:text name="projectGroupNotifierSummaryComponent.groupNotifiers"><s:param value="projectGroup.name"/></s:text></h3>
+ <s:if test="projectGroupNotifierSummaries.size() > 0">
<ec:table items="projectGroupNotifierSummaries"
var="projectGroupNotifierSummary"
autoIncludeParameters="false"
@@ -41,9 +40,9 @@
<ec:column property="editActions" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<s:url id="editUrl" action="editProjectGroupNotifier" namespace="/">
- <s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
- <s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
- <s:param name="notifierType"><c:out value="${pageScope.projectGroupNotifierSummary.type}"/></s:param>
+ <s:param name="projectGroupId" value="#attr.projectGroupNotifierSummary.projectGroupId"/>
+ <s:param name="notifierId" value="#attr.projectGroupNotifierSummary.id"/>
+ <s:param name="notifierType" value="#attr.projectGroupNotifierSummary.type"/>
</s:url>
<s:a href="%{editUrl}">
<img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
@@ -56,9 +55,9 @@
<ec:column property="deleteActions" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<s:url id="removeUrl" action="deleteProjectGroupNotifier_default.action" namespace="/">
- <s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
- <s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
- <s:param name="notifierType"><c:out value="${pageScope.projectGroupNotifierSummary.type}"/></s:param>
+ <s:param name="projectGroupId" value="#attr.projectGroupNotifierSummary.projectGroupId"/>
+ <s:param name="notifierId" value="#attr.projectGroupNotifierSummary.id"/>
+ <s:param name="notifierType" value="#attr.projectGroupNotifierSummary.type"/>
</s:url>
<s:a href="%{removeUrl}">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
@@ -70,7 +69,7 @@
</ec:column>
</ec:row>
</ec:table>
- </c:if>
+ </s:if>
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<div class="functnbar3">
@@ -82,7 +81,7 @@
</div>
</redback:ifAuthorized>
- <c:if test="${not empty projectNotifierSummaries}">
+ <s:if test="projectNotifierSummaries.size() > 0">
<h3><s:text name="projectGroupNotifierSummaryComponent.projectNotifiers"/></h3>
<ec:table items="projectNotifierSummaries"
var="projectNotifierSummary"
@@ -95,9 +94,9 @@
<ec:row>
<ec:column property="projectName" title="projectView.project.name">
<s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
- <s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
+ <s:param name="projectId" value="#attr.projectNotifierSummary.projectId"/>
</s:url>
- <s:a href="%{projectUrl}"><c:out value="${pageScope.projectNotifierSummary.projectName}"/></s:a>
+ <s:a href="%{projectUrl}"><s:property value="#attr.projectNotifierSummary.projectName"/></s:a>
</ec:column>
<ec:column property="type" title="projectView.notifier.type"/>
<ec:column property="recipient" title="projectView.notifier.recipient"/>
@@ -105,23 +104,21 @@
<!-- ec:column property="sender" title="projectView.notifier.sender"/ -->
<ec:column property="editActions" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
- <c:choose>
- <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
+ <s:if test="!#attr.projectNotifierSummary.fromProject">
<s:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
- <s:param name="projectGroupId"><c:out value="${pageScope.projectNotifierSummary.projectGroupId}"/></s:param>
- <s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
- <s:param name="notifierId"><c:out value="${pageScope.projectNotifierSummary.id}"/></s:param>
- <s:param name="notifierType"><c:out value="${pageScope.projectNotifierSummary.type}"/></s:param>
+ <s:param name="projectGroupId" value="#attr.projectNotifierSummary.projectGroupId"/>
+ <s:param name="projectId" value="#attr.projectNotifierSummary.projectId"/>
+ <s:param name="notifierId" value="#attr.projectNotifierSummary.id"/>
+ <s:param name="notifierType" value="#attr.projectNotifierSummary.type"/>
<s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{editUrl}">
<img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
</s:a>
- </c:when>
- <c:otherwise>
+ </s:if>
+ <s:else>
<img src="<s:url value='/images/edit_disabled.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
- </c:otherwise>
- </c:choose>
+ </s:else>
</redback:ifAuthorized>
<redback:elseAuthorized>
<img src="<s:url value='/images/edit_disabled.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
@@ -129,22 +126,20 @@
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
- <c:choose>
- <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
+ <s:if test="!#attr.projectNotifierSummary.fromProject">
<s:url id="removeUrl" action="deleteProjectNotifier_default.action" namespace="/">
- <s:param name="projectGroupId"><c:out value="${pageScope.projectNotifierSummary.projectGroupId}"/></s:param>
- <s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
- <s:param name="notifierId"><c:out value="${pageScope.projectNotifierSummary.id}"/></s:param>
+ <s:param name="projectGroupId" value="#attr.projectNotifierSummary.projectGroupId"/>
+ <s:param name="projectId" value="#attr.projectNotifierSummary.projectId"/>
+ <s:param name="notifierId" value="#attr.projectNotifierSummary.id"/>
<s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{removeUrl}">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
</s:a>
- </c:when>
- <c:otherwise>
+ </s:if>
+ <s:else>
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
- </c:otherwise>
- </c:choose>
+ </s:else>
</redback:ifAuthorized>
<redback:elseAuthorized>
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
@@ -152,5 +147,5 @@
</ec:column>
</ec:row>
</ec:table>
- </c:if>
+ </s:if>
</s:i18n>
