diff options
Diffstat (limited to 'archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf')
| -rw-r--r-- | archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf | 52 |
1 files changed, 21 insertions, 31 deletions
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf b/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf index a86b779a3..55a9ecc51 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf @@ -18,37 +18,27 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> - <ul> - <c:set var="prevDepth" value="1"/> - <ww:set name="dependencyTree" value="dependencyTree"/> - <c:forEach items="${dependencyTree}" var="node"> - <c:choose> - <c:when test="${node.depth < prevDepth}"> - </ul> - <li> - </c:when> - <c:when test="${node.depth > prevDepth}"> - <ul> - <li> - </c:when> - <c:otherwise> - <li> - </c:otherwise> - </c:choose> - <c:set var="url"> - <ww:url action="showArtifact" namespace="/"> - <ww:param name="groupId" value="%{'${node.artifact.groupId}'}"/> - <ww:param name="artifactId" value="%{'${node.artifact.artifactId}'}"/> - <ww:param name="version" value="%{'${node.artifact.version}'}"/> - </ww:url> - </c:set> - <a href="${url}"> - <%-- TODO! show this like the other dependencies: g / g1 / g2 / artifactId / version --%> - <c:out value="${node.artifact.dependencyConflictId}"/> - </a> - </li> - <c:set var="prevDepth" value="${node.depth}" /> - </c:forEach> +<c:set var="prevDepth" value="1"/> +<ww:set name="dependencyTree" value="dependencyTree"/> +<c:forEach items="${dependencyTree}" var="node"> + <c:choose> + <c:when test="${node.depth < prevDepth}"> + </ul> + <li> + </c:when> + <c:when test="${node.depth > prevDepth}"> + <ul> + <li> + </c:when> + <c:otherwise> + <li> + </c:otherwise> + </c:choose> + <my:showArtifactLink groupId="${node.artifact.groupId}" artifactId="${node.artifact.artifactId}" + version="${node.artifact.version}"/> + </li> + <c:set var="prevDepth" value="${node.depth}"/> +</c:forEach> </ul>
\ No newline at end of file |