You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ja...@apache.org on 2006/02/01 13:57:35 UTC
svn commit: r374059 -
/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp
Author: jann
Date: Wed Feb 1 04:57:32 2006
New Revision: 374059
URL: http://svn.apache.org/viewcvs?rev=374059&view=rev
Log:
Adding an identifier string which can be used within the trash area in order to show the original path of a deleted document
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp?rev=374059&r1=374058&r2=374059&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp Wed Feb 1 04:57:32 2006
@@ -38,12 +38,14 @@
<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:include>org.apache.lenya.cms.publication.DublinCoreHelper</xsp:include>
</xsp:structure>
<lenya-info:info>
<lenya-info:overview>
<xsp:logic>
+ String identifier = null;
final Document doc = (Document)<input:get-attribute module="page-envelope" as="object" name="document"/>;
String visibility = "visible";
@@ -53,6 +55,16 @@
} catch(SiteTreeException e) {
throw new ProcessingException(e);
}
+
+ try {
+ identifier = DublinCoreHelper.getDCIdentifier(doc.getPublication(), doc.getArea(), doc.getId());
+ } catch (Exception e) {
+ throw new ProcessingException(e);
+ }
+
+ if (identifier == null) {
+ identifier ="The identifier is null";
+ }
boolean exists = false;
boolean existsLanguage = false;
@@ -99,6 +111,7 @@
<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:identifier><xsp:expr>identifier</xsp:expr></lenya-info:identifier>
}
</xsp:logic>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org