Index: src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
===================================================================
--- src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp	(revision 735810)
+++ src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp	(working copy)
@@ -67,61 +67,65 @@
       </ec:column>
       <ec:column property="editAction" title="&nbsp;" width="1%">
         <%-- if the from is PROJECT then render the links differently --%>
-        <s:if test="pageScope.buildDefinitionSummary.from == 'PROJECT'">
-          <redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
-            <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
-              <s:param name="projectId">${projectId}</s:param>
-              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
-            </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>
-          </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" />
-          </redback:elseAuthorized>
-        </s:if>
-        <s:else>
-          <redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
-            <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
-              <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
-              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
-              <s:param name="groupBuildDefinition">true</s:param>
-            </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>
-          </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" />
-          </redback:elseAuthorized>
-        </s:else>
+        <c:choose>
+          <c:when test="${pageScope.buildDefinitionSummary.from=='PROJECT'}">
+            <redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
+              <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+                <s:param name="projectId">${projectId}</s:param>
+                <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+              </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>
+            </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" />
+            </redback:elseAuthorized>
+          </c:when>
+          <c:otherwise>
+            <redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
+              <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+                <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+                <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+                <s:param name="groupBuildDefinition">true</s:param>
+              </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>
+            </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" />
+            </redback:elseAuthorized>
+          </c:otherwise>
+        </c:choose>
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%">
         <%-- if the from is PROJECT then render the links differently --%>
-        <s:if test="pageScope.buildDefinitionSummary.from == 'PROJECT'">
-          <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
-            <s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
-              <s:param name="projectId">${projectId}</s:param>
-              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
-              <s:param name="confirmed" value="false"/>
-            </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>
-          </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" />
-          </redback:elseAuthorized>
-        </s:if>
-        <s:else>
-          <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
-            <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
-              <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
-              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
-              <s:param name="groupBuildDefinition">true</s:param>
-              <s:param name="confirmed" value="false"/>
-            </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>
-          </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" />
-          </redback:elseAuthorized>
-        </s:else>
+         <c:choose>
+          <c:when test="${pageScope.buildDefinitionSummary.from=='PROJECT'}">
+            <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
+              <s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
+                <s:param name="projectId">${projectId}</s:param>
+                <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+                <s:param name="confirmed" value="false"/>
+              </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>
+            </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" />
+            </redback:elseAuthorized>
+          </c:when>
+          <c:otherwise>
+            <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
+              <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+                <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+                <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+                <s:param name="groupBuildDefinition">true</s:param>
+                <s:param name="confirmed" value="false"/>
+              </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>
+            </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" />
+            </redback:elseAuthorized>
+          </c:otherwise>
+        </c:choose>
       </ec:column>
     </ec:row>
   </ec:table>