You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2006/10/11 00:28:32 UTC
svn commit: r462611 - in /lenya/trunk/src/modules/webdav/usecases/webdav:
filePropfind.jx propfind.jx
Author: chestnut
Date: Tue Oct 10 15:28:29 2006
New Revision: 462611
URL: http://svn.apache.org/viewvc?view=rev&rev=462611
Log:
use path instead of id for webDAV propfind listing
Modified:
lenya/trunk/src/modules/webdav/usecases/webdav/filePropfind.jx
lenya/trunk/src/modules/webdav/usecases/webdav/propfind.jx
Modified: lenya/trunk/src/modules/webdav/usecases/webdav/filePropfind.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/usecases/webdav/filePropfind.jx?view=diff&rev=462611&r1=462610&r2=462611
==============================================================================
--- lenya/trunk/src/modules/webdav/usecases/webdav/filePropfind.jx (original)
+++ lenya/trunk/src/modules/webdav/usecases/webdav/filePropfind.jx Tue Oct 10 15:28:29 2006
@@ -12,7 +12,7 @@
<jx:set var="fileExtension" value="html"/>
</jx:if>
<D:response>
- <D:href>${request.getContextPath()}/${doc.getPublication().getId()}/webdav${doc.getId()}_${doc.getLanguage()}.${fileExtension}</D:href>
+ <D:href>${request.getContextPath()}/${doc.getPublication().getId()}/webdav${doc.getPath()}_${doc.getLanguage()}.${fileExtension}</D:href>
<D:propstat>
<D:prop>
<D:displayname>${doc.getName()}_${doc.getLanguage()}.${fileExtension}</D:displayname>
Modified: lenya/trunk/src/modules/webdav/usecases/webdav/propfind.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/usecases/webdav/propfind.jx?view=diff&rev=462611&r1=462610&r2=462611
==============================================================================
--- lenya/trunk/src/modules/webdav/usecases/webdav/propfind.jx (original)
+++ lenya/trunk/src/modules/webdav/usecases/webdav/propfind.jx Tue Oct 10 15:28:29 2006
@@ -25,13 +25,14 @@
</D:response>
<jx:if test="${request.getHeader('depth') > 0}">
<jx:forEach var="doc" items="${usecase.getParameter('documents')}">
+ <!-- FIXME: shouldn't this conditional be doc.exists()? -->
<jx:if test="${doc.getId()}">
<jx:if test="${doc.getLanguage().equals(defaultLang)}">
<!-- create a directory for each document;
the language check is to prevent multiple folders appearing with the same name
since concepts_en and concepts_de would both produce a folder called concepts -->
<D:response>
- <D:href>${request.getContextPath()}/${doc.getPublication().getId()}/webdav${doc.getId()}</D:href>
+ <D:href>${request.getContextPath()}/${doc.getPublication().getId()}/webdav${doc.getPath()}</D:href>
<D:propstat>
<D:prop>
<D:displayname>${doc.getName()}</D:displayname>
@@ -61,7 +62,7 @@
<!-- create a file for each document, the href is the path to the file and the
display name is what will appear in the webdav folder -->
<D:response>
- <D:href>${request.getContextPath()}/${doc.getPublication().getId()}/webdav${doc.getId()}_${doc.getLanguage()}.${fileExtension}</D:href>
+ <D:href>${request.getContextPath()}/${doc.getPublication().getId()}/webdav${doc.getPath()}_${doc.getLanguage()}.${fileExtension}</D:href>
<D:propstat>
<D:prop>
<D:displayname>${doc.getName()}_${doc.getLanguage()}.${fileExtension}</D:displayname>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org