You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ro...@apache.org on 2004/10/30 22:53:54 UTC
svn commit: rev 56078 - in incubator/lenya/branches/BRANCH_1_2_X/src: java/org/apache/lenya/cms/cocoon/components/modules/input webapp/lenya/content/info
Author: roku
Date: Sat Oct 30 13:53:53 2004
New Revision: 56078
Modified:
incubator/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java
incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp
Log:
Fixed 31955
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java Sat Oct 30 13:53:53 2004
@@ -37,9 +37,10 @@
public static final String AUTHORING_NODE = "authoring-node";
public static final String LIVE_NODE = "live-node";
public static final String TRASH_NODE = "trash-node";
+ public static final String ARCHIVE_NODE = "archive-node";
public static final String FIRST_CHILD_ID = "first-child-id";
- protected static final String[] PARAMETER_NAMES = { AUTHORING_NODE, LIVE_NODE, TRASH_NODE, FIRST_CHILD_ID };
+ protected static final String[] PARAMETER_NAMES = { AUTHORING_NODE, LIVE_NODE, TRASH_NODE, ARCHIVE_NODE, FIRST_CHILD_ID };
/**
* @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
@@ -64,8 +65,13 @@
}
if (name.equals(TRASH_NODE)) {
- SiteTree authoringTree = publication.getSiteTree(Publication.TRASH_AREA);
- value = authoringTree.getNode(envelope.getDocument().getId());
+ SiteTree trashTree = publication.getSiteTree(Publication.TRASH_AREA);
+ value = trashTree.getNode(envelope.getDocument().getId());
+ }
+
+ if (name.equals(ARCHIVE_NODE)) {
+ SiteTree archiveTree = publication.getSiteTree(Publication.ARCHIVE_AREA);
+ value = archiveTree.getNode(envelope.getDocument().getId());
}
if (name.equals(FIRST_CHILD_ID)) {
Modified: incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp
==============================================================================
--- incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp (original)
+++ incubator/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp Sat Oct 30 13:53:53 2004
@@ -35,6 +35,7 @@
<xsp:include>org.apache.lenya.cms.publication.DefaultDocumentBuilder</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.Document</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.DocumentException</xsp:include>
+ <xsp:include>org.apache.lenya.cms.publication.SiteTreeException</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.xsp.DocumentLanguagesHelper</xsp:include>
<xsp:include>org.apache.lenya.cms.publication.SiteTreeNode</xsp:include>
</xsp:structure>
@@ -43,17 +44,15 @@
<lenya-info:overview>
<xsp:logic>
- Document doc = (Document)<input:get-attribute module="page-envelope" as="object" name="document"/>;
-
- final Object nodeObject = <input:get-attribute module="sitetree" as="object" name="authoring-node"/>;
- SiteTreeNode node = null;
+ final Document doc = (Document)<input:get-attribute module="page-envelope" as="object" name="document"/>;
String visibility = "visible";
- if(nodeObject instanceof SiteTreeNode) {
- node = (SiteTreeNode) <input:get-attribute module="sitetree" as="object" name="authoring-node"/>;
+
+ try {
+ SiteTreeNode node = doc.getPublication().getSiteTree(doc.getArea()).getNode(doc.getId());
+ if (!node.visibleInNav()) visibility = "hidden";
+ } catch(SiteTreeException e) {
+ throw new ProcessingException(e);
}
- else
- node = (SiteTreeNode) <input:get-attribute module="sitetree" as="object" name="trash-node"/>;
- if (!node.visibleInNav()) visibility = "hidden";
boolean exists = false;
boolean existsLanguage = false;
@@ -98,7 +97,7 @@
<lenya-info:area></lenya-info:area>
<lenya-info:workflow-state><input:get-attribute module="workflow" as="string" name="state"/></lenya-info:workflow-state>
<lenya-info:is-live><input:get-attribute module="workflow" as="string" name="variable.is_live"/></lenya-info:is-live>
- <lenya-info:visibleinnav><xsp:expr>visibility</xsp:expr></lenya-info:visibleinnav>
+ <lenya-info:visibleinnav><xsp:expr>visibility</xsp:expr></lenya-info:visibleinnav>
}
</xsp:logic>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org