summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2010-10-22 11:26:53 (EDT)
committer Glyn Normington2010-11-02 08:06:49 (EDT)
commit818dd2eaee7250dc697f9a7c439e1d51a7432b4e (patch)
tree2dfecec40480c409161a7fc85ffd6fa87c27f88f
parent529ecbf7822c19e0bc069220449464f168361cb3 (diff)
downloadorg.eclipse.virgo.apps-818dd2eaee7250dc697f9a7c439e1d51a7432b4e.zip
org.eclipse.virgo.apps-818dd2eaee7250dc697f9a7c439e1d51a7432b4e.tar.gz
org.eclipse.virgo.apps-818dd2eaee7250dc697f9a7c439e1d51a7432b4e.tar.bz2
328312 Fixing Require bundle header display in the admin console
-rw-r--r--org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp11
1 files changed, 10 insertions, 1 deletions
diff --git a/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp b/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp
index 8b78ad8..4ff42fe 100644
--- a/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp
+++ b/org.eclipse.virgo.apps.admin.web/src/main/webapp/WEB-INF/jsp/state-bundle.jsp
@@ -179,6 +179,15 @@
<th>Attributes</th>
</tr>
<c:forEach var="require" items="${requires}" varStatus="loopStatus">
+ <!-- CREATE THE PROVIDER STRING -->
+ <c:choose>
+ <c:when test="${require eq null}">
+ <c:set var="provider" value=""/>
+ </c:when>
+ <c:otherwise>
+ <c:set var="provider" value="${require.provider.bundleId} (${require.provider.symbolicName} - ${require.provider.version})"/>
+ </c:otherwise>
+ </c:choose>
<!-- ROW COLOURING -->
<c:set var="rowStyle" value="odd" scope="page" />
<c:if test="${(loopStatus.index % 2) eq 0}">
@@ -186,7 +195,7 @@
</c:if>
<!-- DISPLAY THE NEXT ROW -->
<tr class="sublevel1-${rowStyle}">
- <td>${require.requiredBundleName}</td>
+ <td><a href="<c:url value="bundle.htm?id=${require.provider.bundleId}&state=${state}" />">${require.requiredBundleName}</a></td>
<td>${require.versionConstraint}</td>
<td>
<c:if test="${require ne null}">