You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/04/17 18:22:37 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/authoring asset.xsp
gregor 2004/04/17 09:22:37
Modified: src/webapp/lenya/content/authoring asset.xsp
Log:
allow overriding of document-id
UGLY
Revision Changes Path
1.6 +6 -2 cocoon-lenya/src/webapp/lenya/content/authoring/asset.xsp
Index: asset.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/authoring/asset.xsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- asset.xsp 13 Mar 2004 12:31:31 -0000 1.5
+++ asset.xsp 17 Apr 2004 16:22:37 -0000 1.6
@@ -37,13 +37,17 @@
Document doc = (Document) <input:get-attribute module="page-envelope" as="object" name="document"/>;
ResourcesManager resourceMgr = new ResourcesManager(doc);
File[] resources = resourceMgr.getResources();
+ String docid = (String) <input:get-attribute module="request-param" name="document-id"/>;
+ if (docid == "") {
+ docid = (String) <input:get-attribute module="page-envelope" name="document-id"/>;
+ }
</xsp:logic>
<usecase:request-uri><input:get-attribute module="request" name="requestURI"/></usecase:request-uri>
<usecase:date><input:get-attribute module="date" name="currentDate"/></usecase:date>
<usecase:creator><input:get-attribute module="access-control" name="user-name"/></usecase:creator>
<usecase:area><input:get-attribute module="page-envelope" name="area"/></usecase:area>
- <usecase:document-id><input:get-attribute module="page-envelope" name="document-id"/></usecase:document-id>
+ <usecase:document-id><xsp:expr>docid</xsp:expr></usecase:document-id>
<usecase:language><input:get-attribute module="page-envelope" name="document-language"/></usecase:language>
<usecase:assets>
<xsp:logic>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org