You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/06/13 16:17:37 UTC
svn commit: r546885 - in
/lenya/trunk/src/modules-core/administration/usecases: groups.jx ipRange.jx
ipRanges.jx sessions.jx siteOverview.jx user.jx users.jx
Author: andreas
Date: Wed Jun 13 07:17:36 2007
New Revision: 546885
URL: http://svn.apache.org/viewvc?view=rev&rev=546885
Log:
Fixed URLs in administration module
Modified:
lenya/trunk/src/modules-core/administration/usecases/groups.jx
lenya/trunk/src/modules-core/administration/usecases/ipRange.jx
lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
lenya/trunk/src/modules-core/administration/usecases/sessions.jx
lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx
lenya/trunk/src/modules-core/administration/usecases/user.jx
lenya/trunk/src/modules-core/administration/usecases/users.jx
Modified: lenya/trunk/src/modules-core/administration/usecases/groups.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groups.jx?view=diff&rev=546885&r1=546884&r2=546885
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groups.jx Wed Jun 13 07:17:36 2007
@@ -60,7 +60,7 @@
<jx:forEach var="group" items="${usecase.getParameter('groups')}">
<tr>
<td style="vertical-align: middle">
- <a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.group&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
+ <a href="${request.requestURI}?lenya.usecase=admin.group&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
</td>
<td style="vertical-align: middle">
<jx:if test="${group.getName().equals('')}"><span style="color: #999999">--</span></jx:if>
Modified: lenya/trunk/src/modules-core/administration/usecases/ipRange.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRange.jx?view=diff&rev=546885&r1=546884&r2=546885
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRange.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRange.jx Wed Jun 13 07:17:36 2007
@@ -81,7 +81,7 @@
<jx:set var="groups" value="${ipRange.getGroups()}"/>
<jx:if test="${groups.size() == 0}"><i18n:text>No groups assigned</i18n:text></jx:if>
<jx:forEach var="group" items="${groups}">
- <a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
+ <a href="${request.pathInfo}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
</jx:forEach>
</td>
</tr>
Modified: lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx?view=diff&rev=546885&r1=546884&r2=546885
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx Wed Jun 13 07:17:36 2007
@@ -55,7 +55,7 @@
<jx:forEach var="ipRange" items="${usecase.getParameter('ipRanges')}">
<tr>
<td style="vertical-align: middle">
- <a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.ipRange&ipRangeId=${ipRange.getId()}"><jx:out value="${ipRange.getId()}"/></a>
+ <a href="${request.pathInfo}?lenya.usecase=admin.ipRange&ipRangeId=${ipRange.getId()}"><jx:out value="${ipRange.getId()}"/></a>
</td>
<td style="vertical-align: middle">
<jx:out value="${ipRange.getName()}"/>
@@ -63,7 +63,7 @@
<td>
<jx:if test="${ipRange.getGroups().size() == 0}"><span style="color: #999999">--</span></jx:if>
<jx:forEach var="group" items="${ipRange.getGroups()}">
- <a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
+ <a href="${request.pathInfo}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a>
</jx:forEach>
</td>
<td style="vertical-align: middle">
Modified: lenya/trunk/src/modules-core/administration/usecases/sessions.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/sessions.jx?view=diff&rev=546885&r1=546884&r2=546885
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/sessions.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/sessions.jx Wed Jun 13 07:17:36 2007
@@ -47,7 +47,7 @@
<jx:forEach var="user" items="${usecase.getParameter('users')}">
<tr>
<td style="vertical-align: middle">
- <a href="${request.requestURI}?lenya.usecase=admin.user&userId=${user.getId()}"><jx:out value="${user.getId()}"/></a>
+ <a href="${request.pathInfo}?lenya.usecase=admin.user&userId=${user.getId()}"><jx:out value="${user.getId()}"/></a>
</td>
<td style="vertical-align: middle">
<jx:out value="${user.getName()}"/>
Modified: lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx?view=diff&rev=546885&r1=546884&r2=546885
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx Wed Jun 13 07:17:36 2007
@@ -87,12 +87,12 @@
<td>
<jx:choose>
<jx:when test="${key.equals('keyPath')}">
- <a href="${request.getContextPath()}${entry.getValue('keyUrl')}">
+ <a href="${entry.getValue('keyUrl')}">
<i18n:text><jx:out value="${entry.getValue(key)}"/></i18n:text>
</a>
</jx:when>
<jx:when test="${key.equals('keyCheckedOut') && !entry.getValue(key).equals('')}">
- <a href="${request.getRequestURI()}?lenya.usecase=admin.user&userId=${entry.getValue(key)}">
+ <a href="${request.pathInfo}?lenya.usecase=admin.user&userId=${entry.getValue(key)}">
<i18n:text><jx:out value="${entry.getValue(key)}"/></i18n:text>
</a>
</jx:when>
Modified: lenya/trunk/src/modules-core/administration/usecases/user.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/user.jx?view=diff&rev=546885&r1=546884&r2=546885
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/user.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/user.jx Wed Jun 13 07:17:36 2007
@@ -102,7 +102,7 @@
<jx:set var="groups" value="${user.getGroups()}"/>
<jx:if test="${groups.size() == 0}"><i18n:text>No groups assigned</i18n:text></jx:if>
<jx:forEach var="group" items="${groups}"><jx:if test="${group != groups[0]}">, </jx:if>
- <a href="${request.contextPath}${request.requestURI}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a></jx:forEach>
+ <a href="${request.pathInfo}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a></jx:forEach>
</td>
</tr>
Modified: lenya/trunk/src/modules-core/administration/usecases/users.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/users.jx?view=diff&rev=546885&r1=546884&r2=546885
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/users.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/users.jx Wed Jun 13 07:17:36 2007
@@ -66,7 +66,7 @@
<jx:forEach var="user" items="${usecase.getParameter('users')}">
<tr>
<td style="vertical-align: middle">
- <a href="${request.requestURI}?lenya.usecase=admin.user&userId=${user.getId()}"><jx:out value="${user.getId()}"/></a>
+ <a href="${request.pathInfo}?lenya.usecase=admin.user&userId=${user.getId()}"><jx:out value="${user.getId()}"/></a>
</td>
<td style="vertical-align: middle">
<jx:out value="${user.getName()}"/>
@@ -74,7 +74,7 @@
<td>
<jx:set var="groups" value="${user.getGroups()}"/>
<jx:forEach var="group" items="${groups}"><jx:if test="${group != groups[0]}">, </jx:if>
- <a href="${request.requestURI}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a></jx:forEach>
+ <a href="${request.pathInfo}?lenya.usecase=admin.groupProfile&groupId=${group.getId()}"><jx:out value="${group.getId()}"/></a></jx:forEach>
</td>
<td style="vertical-align: middle">
<form method="GET" id="form-delete_user">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org