Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-131] fix url rendering bugs 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@437200 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2006-08-26 18:17:15 +00:00
parent 6dc709e9b9
commit 08866503a2
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
View File

@ -5,13 +5,21 @@
<c:forEach items="${dependencies}" var="dependency"> <c:forEach items="${dependencies}" var="dependency">
<h3> <h3>
<c:set var="url"> <c:set var="url">
<ww:url action="showArtifact" namespace="/"> <c:choose>
<ww:param name="groupId" value="%{'${dependency.groupId}'}"/> <c:when test="${!empty(dependency.version)}">
<ww:param name="artifactId" value="%{'${dependency.artifactId}'}"/> <ww:url action="showArtifact" namespace="/">
<c:if test="${!empty(dependency.version)}"> <ww:param name="groupId" value="%{'${dependency.groupId}'}"/>
<ww:param name="version" value="%{'${dependency.version}'}"/> <ww:param name="artifactId" value="%{'${dependency.artifactId}'}"/>
</c:if> <ww:param name="version" value="%{'${dependency.version}'}"/>
</ww:url> </ww:url>
</c:when>
<c:otherwise>
<ww:url action="browseArtifact" namespace="/">
<ww:param name="groupId" value="%{'${dependency.groupId}'}"/>
<ww:param name="artifactId" value="%{'${dependency.artifactId}'}"/>
</ww:url>
</c:otherwise>
</c:choose>
</c:set> </c:set>
<%-- TODO: showing the name and description would be nice, but that would require loading the POMs --%> <%-- TODO: showing the name and description would be nice, but that would require loading the POMs --%>
<a href="${url}">${dependency.artifactId}</a> <a href="${url}">${dependency.artifactId}</a>
@ -21,6 +29,7 @@
<p> <p>
<span style="font-size: x-small"> <span style="font-size: x-small">
<%-- TODO! share with browse as a tag --%> <%-- TODO! share with browse as a tag --%>
<c:set var="cumulativeGroup" value=""/>
<c:forTokens items="${dependency.groupId}" delims="." var="part"> <c:forTokens items="${dependency.groupId}" delims="." var="part">
<c:choose> <c:choose>
<c:when test="${empty(cumulativeGroup)}"> <c:when test="${empty(cumulativeGroup)}">

33
archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
View File

@ -2,24 +2,29 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<p> <p>
<c:set var="cumulativeGroup" value=""/>
<c:forTokens items="${model.groupId}" delims="." var="part"> <c:forTokens items="${model.groupId}" delims="." var="part">
<c:choose> <c:choose>
<c:when test="${empty(cumulativeGroup)}"> <c:when test="${empty(cumulativeGroup)}">
<c:set var="cumulativeGroup" value="${part}"/> <c:set var="cumulativeGroup" value="${part}"/>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:set var="cumulativeGroup" value="${cumulativeGroup}/${part}"/> <c:set var="cumulativeGroup" value="${cumulativeGroup}.${part}"/>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<ww:url id="url" action="browseGroup" namespace="/"> <c:set var="url">
<ww:param name="groupId" value="%{'${cumulativeGroup}'}"/> <ww:url action="browseGroup" namespace="/">
</ww:url> <ww:param name="groupId" value="%{'${cumulativeGroup}'}"/>
</ww:url>
</c:set>
<a href="${url}">${part}</a> / <a href="${url}">${part}</a> /
</c:forTokens> </c:forTokens>
<ww:url id="url" action="browseArtifact" namespace="/"> <c:set var="url">
<ww:param name="groupId" value="%{'${model.groupId}'}"/> <ww:url action="browseArtifact" namespace="/">
<ww:param name="artifactId" value="%{'${model.artifactId}'}"/> <ww:param name="groupId" value="%{'${model.groupId}'}"/>
</ww:url> <ww:param name="artifactId" value="%{'${model.artifactId}'}"/>
</ww:url>
</c:set>
<a href="${url}">${model.artifactId}</a> / <a href="${url}">${model.artifactId}</a> /
<strong>${model.version}</strong> <strong>${model.version}</strong>
@ -63,11 +68,13 @@
<th>Parent</th> <th>Parent</th>
<td> <td>
${model.parent.groupId} ${model.parent.artifactId} ${model.parent.version} ${model.parent.groupId} ${model.parent.artifactId} ${model.parent.version}
<ww:url id="url" action="showArtifact" namespace="/"> <c:set var="url">
<ww:param name="groupId" value="%{'${model.parent.groupId}'}"/> <ww:url action="showArtifact" namespace="/">
<ww:param name="artifactId" value="%{'${model.parent.artifactId}'}"/> <ww:param name="groupId" value="%{'${model.parent.groupId}'}"/>
<ww:param name="version" value="%{'${model.parent.version}'}"/> <ww:param name="artifactId" value="%{'${model.parent.artifactId}'}"/>
</ww:url> <ww:param name="version" value="%{'${model.parent.version}'}"/>
</ww:url>
</c:set>
(<a href="${url}">View</a>) (<a href="${url}">View</a>)
</td> </td>
</tr> </tr>