You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ed...@apache.org on 2004/01/26 18:40:42 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/content/info rename.xsp
edith 2004/01/26 09:40:42
Modified: src/webapp/lenya/xslt/info rename.xsl
src/webapp/lenya usecase.xmap
src/webapp/lenya/content/info rename.xsp
Log:
fix the redirect for the rename. Redirect to the parent
Revision Changes Path
1.16 +2 -1 cocoon-lenya/src/webapp/lenya/xslt/info/rename.xsl
Index: rename.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/rename.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rename.xsl 16 Jan 2004 17:19:03 -0000 1.15
+++ rename.xsl 26 Jan 2004 17:40:41 -0000 1.16
@@ -67,6 +67,7 @@
</xsl:call-template>
<input type="hidden" name="lenya.usecase" value="rename"/>
<input type="hidden" name="lenya.step" value="rename"/>
+ <input type="hidden" name="parenturl" value="{parent-url}"/>
<table class="lenya-table-noborder">
<tr>
1.177 +2 -2 cocoon-lenya/src/webapp/lenya/usecase.xmap
Index: usecase.xmap
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/usecase.xmap,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- usecase.xmap 26 Jan 2004 10:34:35 -0000 1.176
+++ usecase.xmap 26 Jan 2004 17:40:41 -0000 1.177
@@ -825,7 +825,7 @@
<map:match pattern="showscreen" type="step">
<map:generate src="content/rc/versions-screen.xsp" type="serverpages"/>
<map:transform src="xslt/rc/rollback.xsl"/>
- <map:serialize/>
+ <map:call resource="style-cms-page"/>
</map:match>
<map:match pattern="view" type="step">
@@ -1158,7 +1158,7 @@
<map:match pattern="rename" type="step">
<map:act type="task">
- <map:redirect-to session="true" uri="{request:contextPath}/{../../../1}/{../../../2}/{request-param:properties.node.secdocumentid}"/>
+ <map:redirect-to session="true" uri="{request-param:parenturl}"/>
</map:act>
</map:match>
1.11 +4 -0 cocoon-lenya/src/webapp/lenya/content/info/rename.xsp
Index: rename.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/rename.xsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rename.xsp 23 Sep 2003 13:53:15 -0000 1.10
+++ rename.xsp 26 Jan 2004 17:40:41 -0000 1.11
@@ -10,6 +10,7 @@
<xsp:structure>
<xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.SiteTreeNode</xsp:include>
+ <xsp:include>org.apache.lenya.cms.publication.DocumentHelper</xsp:include>
</xsp:structure>
<page>
@@ -18,6 +19,9 @@
Document document = (Document) <input:get-attribute module="page-envelope" as="object" name="document"/>;
SiteTreeNode node = (SiteTreeNode) <input:get-attribute module="sitetree" as="object" name="authoring-node"/>;
String refDocumentId = node.getNextSiblingDocumentId();
+ DocumentHelper documentHelper = new DocumentHelper(objectModel);
+ String parentUrl = documentHelper.getCompleteParentUrl();
+ <parent-url><xsp:expr>parentUrl</xsp:expr></parent-url>
</xsp:logic>
<request-uri><xsp-request:get-uri/></request-uri>
<destination-id><input:get-attribute module="page-envelope" as="string" name="document-node-id"/></destination-id>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org