[OFBiz] SVN: r6878 - in trunk/applications/content: script/org/ofbiz/content/compdoc servicedef webapp/content/WEB-INF widget widget/compdoc
byersa@svn.ofbiz.org
byersa at svn.ofbiz.org
Wed Mar 1 17:08:24 CST 2006
Author: byersa
Date: 2006-03-01 17:08:15 -0600 (Wed, 01 Mar 2006)
New Revision: 6878
Modified:
trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
trunk/applications/content/servicedef/services.xml
trunk/applications/content/webapp/content/WEB-INF/controller.xml
trunk/applications/content/widget/CommonScreens.xml
trunk/applications/content/widget/compdoc/CompDocForms.xml
trunk/applications/content/widget/compdoc/CompDocMenus.xml
trunk/applications/content/widget/compdoc/CompDocScreens.xml
trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
Log:
A refactoring of all the CompDoc parameter passing.
Modified: trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
===================================================================
--- trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -82,7 +82,7 @@
<create-value value-name="rootInstanceContent"/>
<log message="genCompDocInstance 3> rootInstanceContent: ${rootInstanceContent}" level="info"/>
- <field-to-result result-name="rootInstanceContentId" field-name="rootInstanceContent.contentId"/>
+ <field-to-result result-name="contentId" field-name="rootInstanceContent.contentId"/>
<set from-field="parameters.instanceOfContentId" field="parentTemplateContentId"/>
<set from-field="rootInstanceContent.contentId" field="parentInstanceContentId"/>
@@ -242,6 +242,8 @@
<set from-field="parameters.rootInstanceContentId" default-value="${pResults.contentId}" field="revisionMap.contentId"/>
</then>
</if>
+ <set field="revisionMap.contentId" from-field="parameters.rootContentId" default-value="${pResults.caContentIdTo}"/>
+ <set field="revisionMap.contentId" from-field="revisionMap.contentId" default-value="${pResults.contentId}"/>
<set field="revisionMap.itemContentId" from-field="pResults.contentId"/>
<set field="revisionMap.userLogin" from-field="parameters.userLogin"/>
<log level="info" message="revisionMap : ${revisionMap}"/>
Modified: trunk/applications/content/servicedef/services.xml
===================================================================
--- trunk/applications/content/servicedef/services.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/servicedef/services.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -1342,7 +1342,8 @@
<description>Generate parallel CompDoc Instance tree</description>
<attribute name="contentName" type="String" mode="IN" optional="true"/>
<attribute name="instanceOfContentId" type="String" mode="IN" optional="true"/>
- <attribute name="rootInstanceContentId" type="String" mode="INOUT" optional="true"/>
+ <attribute name="rootInstanceContentId" type="String" mode="IN" optional="true"/>
+ <attribute name="contentId" type="String" mode="OUT" optional="true"/>
<attribute name="contentRevisionSeqId" type="String" mode="OUT" optional="false"/>
</service>
@@ -1352,8 +1353,7 @@
<description>Create a CompDoc Template entity and associated ContentRevision/Item entities</description>
<implements service="persistContentAndAssoc"/>
<attribute name="contentRevisionSeqId" type="String" mode="OUT" optional="false"/>
- <attribute name="rootTemplateContentId" type="String" mode="IN" optional="true"/>
- <attribute name="rootInstanceContentId" type="String" mode="INOUT" optional="true"/>
+ <attribute name="rootContentId" type="String" mode="IN" optional="true"/>
</service>
<service name="cloneContentApprovals" engine="simple"
Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -791,21 +791,18 @@
<!-- ================ CompDoc Requests ================= -->
<request-map uri="FindCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="FindCompDoc"/></request-map>
<!-- combined with FindCompDoc: <request-map uri="ListCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="ListCompDoc"/></request-map> -->
- <request-map uri="EditCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="EditCompDoc"/></request-map>
<request-map uri="EditRootCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="EditRootCompDoc"/></request-map>
<request-map uri="EditChildCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="EditChildCompDoc"/></request-map>
<request-map uri="ViewCompDocTree"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocTree"/></request-map>
<request-map uri="ViewCompDocTemplateTree"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocTemplateTree"/></request-map>
<request-map uri="ViewCompDocInstanceTree"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocInstanceTree"/></request-map>
<request-map uri="CompDocTemplateTree"><security auth="true" https="true"/><response name="success" type="view" value="CompDocTemplateTree"/></request-map>
- <request-map uri="EditCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="EditCompDoc"/></request-map>
<request-map uri="EditRootCompDocContent"><security auth="true" https="true"/><response name="success" type="view" value="EditRootCompDocContent"/></request-map>
<request-map uri="AddRootCompDocInstance"><security auth="true" https="true"/><response name="success" type="view" value="AddRootCompDocInstance"/></request-map>
<request-map uri="AddRootCompDocTemplate"><security auth="true" https="true"/><response name="success" type="view" value="AddRootCompDocTemplate"/></request-map>
<request-map uri="ViewInstances"><security auth="true" https="true"/><response name="success" type="view" value="ViewInstances"/></request-map>
<request-map uri="EditRootCompDocInstance"><security auth="true" https="true"/><response name="success" type="view" value="EditRootCompDocInstance"/></request-map>
- <request-map uri="EditCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="EditCompDoc"/></request-map>
<request-map uri="AddChildCompDocInstance"><security auth="true" https="true"/><response name="success" type="view" value="AddChildCompDocInstance"/></request-map>
<request-map uri="AddChildCompDocTemplate"><security auth="true" https="true"/><response name="success" type="view" value="AddChildCompDocTemplate"/></request-map>
@@ -869,13 +866,13 @@
<request-map uri="updateChildCompDocInstance">
<security auth="true" https="true"/>
<event invoke="persistCompDoc" path="" type="service"/>
- <response name="success" type="view" value="EditCompDoc"/>
- <response name="error" type="view" value="EditCompDoc"/>
+ <response name="success" type="view" value="EditChildCompDoc"/>
+ <response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
<request-map uri="genCompDocInstance">
<security auth="true" https="true"/>
<event invoke="genCompDocInstance" path="" type="service"/>
- <response name="success" type="view" value="EditCompDoc"/>
+ <response name="success" type="view" value="EditRootCompDoc"/>
<response name="error" type="view" value="AddRootCompDocInstance"/>
</request-map>
@@ -1507,7 +1504,6 @@
<view-map name="FindCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#FindCompDoc" type="screen"/>
<!-- combined with FindCompDoc: <view-map name="ListCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#ListCompDoc" type="screen"/> -->
- <view-map name="EditCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDoc" type="screen"/>
<view-map name="EditRootCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDoc" type="screen"/>
<view-map name="EditChildCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#EditChildCompDoc" type="screen"/>
Modified: trunk/applications/content/widget/CommonScreens.xml
===================================================================
--- trunk/applications/content/widget/CommonScreens.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/widget/CommonScreens.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -86,6 +86,7 @@
<section>
<actions>
<set field="headerItem" value="CompDoc"/>
+ <!--
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
<set from-field="contentTypeId" default-value="${content.contentTypeId}" field="contentTypeId" global="true"/>
<set from-field="contentId" default-value="${content.contentId}" field="contentId" global="true"/>
@@ -98,6 +99,7 @@
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
<set from-field="parameters.contentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="contentRevisionSeqId" global="true"/>
+ -->
</actions>
<widgets>
<decorator-screen name="mainContentDecorator" >
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -64,10 +64,10 @@
<hyperlink also-hidden="false" description="Edit" target="EditChildCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
</field>
<field name="tree" title="" use-when="contentTypeId.equals("COMPDOC_TEMPLATE")" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Tree" target="ViewCompDocTemplateTree?contentId=${contentId}"/>
+ <hyperlink also-hidden="false" description="Tree" target="ViewCompDocTemplateTree?rootContentId=${contentId}"/>
</field>
<field name="tree" title="" use-when="contentTypeId.equals("COMPDOC_INSTANCE")" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Tree" target="ViewCompDocInstanceTree?contentId=${contentId}"/>
+ <hyperlink also-hidden="false" description="Tree" target="ViewCompDocInstanceTree?rootContentId=${contentId}"/>
</field>
</form>
@@ -81,10 +81,10 @@
<field name="caFromDate" title="From Date"><display/></field>
<field name="caThruDate"><hidden/></field>
<field name="editTemplate" title="">
- <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}"/>
+ <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?rootContentId=${contentId}"/>
</field>
<field name="templateTree" title="">
- <hyperlink also-hidden="false" description="Tree" target="ViewCompDocInstanceTree?contentId=${contentId}"/>
+ <hyperlink also-hidden="false" description="Tree" target="ViewCompDocInstanceTree?rootContentId=${contentId}"/>
</field>
</form>
@@ -116,16 +116,16 @@
<field name="committedByPartyId"><display/></field>
<field name="comments"><display/></field>
<field name="editLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Edit]" target="EditContentRevision?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <hyperlink also-hidden="false" description="[Edit]" target="EditContentRevision?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</field>
<field name="itemLink" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Items]" target="ListContentRevisionItem?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <hyperlink also-hidden="false" description="[Items]" target="ListContentRevisionItem?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</field>
<field name="create" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Create]" target="EditContentRevision?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <hyperlink also-hidden="false" description="[Create]" target="EditContentRevision?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</field>
<field name="tree" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Tree]" target="ViewCompDocTemplateTree?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <hyperlink also-hidden="false" description="[Tree]" target="ViewCompDocTemplateTree?rootContentId=${contentId}&rootContentRevisionSeqId=${contentRevisionSeqId}"/>
</field>
</form>
@@ -240,7 +240,7 @@
<field name="sequenceNum"><display/></field>
<field name="comments"><display/></field>
<field name="Edit" title=" " widget-style="buttontext">
- <hyperlink also-hidden="false" description="[Edit]" target="EditContentApproval?contentApprovalId=${contentApprovalId}&contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <hyperlink also-hidden="false" description="[Edit]" target="EditContentApproval?contentApprovalId=${contentApprovalId}&rootContentId=${contentId}&rootContentRevisionSeqId=${contentRevisionSeqId}"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"><submit/></field>
</form>
@@ -278,8 +278,12 @@
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="contentName"><text/></field>
- <field name="instanceOfContentId" entry-name="rootTemplateContentId" map-name="parameters" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
+ <field name="instanceOfContentId" entry-name="rootContentId" map-name="parameters" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
<field name="contentTypeId"><hidden value="COMPDOC_INSTANCE"/></field>
+ <!--
+ <field name="rootContentId"><hidden/></field>
+ <field name="rootContentRevisionId"><hidden/></field>
+ -->
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -355,6 +359,8 @@
<option key="application/octet-stream" description="Other"/>
</drop-down>
</field>
+ <field name="rootContentId"><hidden/></field>
+ <field name="rootContentRevisionSeqId"><hidden/></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -460,6 +466,7 @@
<field name="mimeTypeId" map-name="dataResource"><hidden/></field>
<field name="objectInfo" title="File Name" map-name="dataResource"><display also-hidden="false"/></field>
<field name="imageData" title="Browse"><file/></field>
+ <field name="rootContentId" ><hidden/></field>
<field name="submitButton" title="Upload" widget-style="smallSubmit"><submit/></field>
</form>
Modified: trunk/applications/content/widget/compdoc/CompDocMenus.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -65,7 +65,7 @@
<if-compare value="TEMPLATE" field-name="contentTypeId" operator="equals"></if-compare>
</or>
</condition>
- <link target="ViewCompDocTemplateTree?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="ViewCompDocTemplateTree?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="viewtree2" title="View Tree">
<condition>
@@ -74,16 +74,16 @@
<if-compare value="DOCUMENT" field-name="contentTypeId" operator="equals"></if-compare>
</or>
</condition>
- <link target="ViewCompDocInstanceTree?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit" title="Edit" >
- <link target="EditRootCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="approval" title="Approvals" >
- <link target="ListContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="ListContentApproval?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="revision" title="Revisions" >
- <link target="ListContentRevisions?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="ListContentRevisions?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
</menu>
@@ -103,7 +103,7 @@
<if-compare value="TEMPLATE" field-name="contentTypeId" operator="equals"></if-compare>
</or>
</condition>
- <link target="ViewCompDocTemplateTree?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="ViewCompDocTemplateTree?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="viewtree2" title="View Tree">
<condition>
@@ -112,7 +112,7 @@
<if-compare value="DOCUMENT" field-name="contentTypeId" operator="equals"></if-compare>
</or>
</condition>
- <link target="ViewCompDocInstanceTree?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit" title="Edit" >
<link target="EditChildCompDoc?contentId=${itemContentId}&itemContentRevisionSeqId=${itemContentRevisionSeqId}&caContentIdTo=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&fromDate=${fromDate}"/>
@@ -153,20 +153,22 @@
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
<menu-item name="edit-inplace" title="${contentName}[${contentId}]" widget-style="head2">
- <link target="EditRootCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-link" title="Edit" >
- <link target="EditRootCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="child" title="+Child" >
- <link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999"/>
+ <link target="AddChildCompDocTemplate?caContentIdTo=${contentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}&sequenceNum=9999"/>
</menu-item>
+ <!-- on page
<menu-item name="viewinst" title="View Instances" >
- <link target="ViewInstances?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="ViewInstances?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="addinst" title="Add Instance" >
- <link target="AddRootCompDocInstance?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="AddRootCompDocInstance?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
+ -->
</menu>
<menu name="childTemplateLine" default-title-style="tabButton"
@@ -178,10 +180,10 @@
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
<menu-item name="edit-inplace" title="${contentName}[${contentId}]" >
- <link target="EditChildCompDoc?itemContentId=${contentId}&contentId=${contentIdTo}&caFromDate=${fromDate}&itemContentRevisionSeqId=${maxRevisionSeqId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditChildCompDoc?itemContentId=${contentId}&contentId=${contentIdTo}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}"/>
</menu-item>
<menu-item name="edit-link" title="Edit" >
- <link target="EditChildCompDoc?contentId=${contentId}&caContentIdTo=${contentIdTo}&caFromDate=${fromDate}&itemContentRevisionSeqId=${maxRevisionSeqId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditChildCompDoc?contentId=${contentId}&caContentIdTo=${contentIdTo}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}"/>
</menu-item>
<!-- only one level for now
<menu-item name="child" title="+Child" >
@@ -195,10 +197,10 @@
<link target="AddChildCompDocTemplate?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumAfter}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}"/>
</menu-item>
<menu-item name="up" title="^Up" >
- <link target="resequenceCompDocPart?contentId=${contentId}&dir=up&contentAssocTypeId=COMPDOC_PART&contentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="resequenceCompDocPart?contentId=${contentId}&dir=up&contentAssocTypeId=COMPDOC_PART&contentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="down" title="vDn" >
- <link target="resequenceCompDocPart?contentId=${contentId}&dir=down&contentAssocTypeId=COMPDOC_PART&contentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="resequenceCompDocPart?contentId=${contentId}&dir=down&contentAssocTypeId=COMPDOC_PART&contentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
</menu>
@@ -227,13 +229,13 @@
<condition>
<if-empty field-name="assocRevisionItemView"/>
</condition>
- <link target="AddChildCompDocInstance?caContentIdTo=${instanceContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
+ <link target="AddChildCompDocInstance?caContentIdTo=${rootContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-link-add" title="Add" >
<condition>
<if-empty field-name="assocRevisionItemView"/>
</condition>
- <link target="AddChildCompDocInstance?caContentIdTo=${instanceContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
+ <link target="AddChildCompDocInstance?caContentIdTo=${rootContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
</menu-item>
<menu-item name="pdf" title="View as PDF" >
@@ -259,7 +261,7 @@
<link target="EditRootCompDoc?contentId=${instanceContentId}&contentRevisionSeqId=${instanceContentRevisionSeqId}"/>
</menu-item>
<menu-item name="viewtree" title="View Template Tree">
- <link target="ViewCompDocTemplateTree?contentRevisionSeqId=${templateContentRevisionSeqId}&contentId=${templateContentId}"/>
+ <link target="ViewCompDocTemplateTree?rootContentRevisionSeqId=${templateContentRevisionSeqId}&rootContentId=${templateContentId}"/>
</menu-item>
</menu>
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -25,6 +25,10 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
+ <set from-field="parameters.rootContentId" field="contentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="contentRevisionSeqId" />
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="approval"/>
<set field="menuName" value="tree"/>
@@ -32,13 +36,13 @@
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
<set from-field="content.contentTypeId" field="contentTypeId" />
<service service-name="getApprovalsWithPermissions" result-map-name="result">
- <field-map field-name="rootContentId" env-name="parameters.contentId"/>
- <field-map field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId"/>
+ <field-map field-name="rootContentId" env-name="contentId"/>
+ <field-map field-name="contentRevisionSeqId" env-name="contentRevisionSeqId"/>
<field-map field-name="checkPermission" value="false" />
</service>
<set field="contentApprovalList" from-field="result.contentApprovalList" />
- <set field="title" value="Content Approvals for ${parameters.contentId}"/>
+ <set field="title" value="Content Approvals for ${contentId}"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -91,6 +95,8 @@
<entity-one entity-name="ContentApproval" value-name="contentApproval" use-cache="true">
<field-map env-name="parameters.contentApprovalId" field-name="contentApprovalId" />
</entity-one>
+ <set from-field="contentApproval.contentId" field="rootContentId"/>
+ <set from-field="contentApproval.contentRevisionSeqId" field="rootContentRevisionSeqId"/>
<entity-one entity-name="Content" value-name="content" use-cache="true">
<field-map field-name="contentId" env-name="contentApproval.contentId"/>
</entity-one>
@@ -113,13 +119,23 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
+ <set from-field="rootContentId" field="contentId" />
+ <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ <set from-field="content.contentTypeId" field="contentTypeId" />
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="revision"/>
<set field="title" value="Revision List Page"/>
- <entity-and entity-name="ContentRevision" list-name="contentRevisionList" use-cache="true">
- <field-map env-name="parameters.contentId" field-name="contentId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true">
+ <field-map field-name="contentId" env-name="contentId"/>
+ </entity-one>
+ <set from-field="content.contentTypeId" field="contentTypeId"/>
+ <entity-and entity-name="ContentRevision" list-name="contentRevisionList" use-cache="true">
+ <field-map env-name="contentId" field-name="contentId" />
</entity-and>
</actions>
<widgets>
@@ -138,6 +154,12 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId" />
+ <set from-field="parameters.contentId" field="contentId" />
+ <set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ <set from-field="content.contentTypeId" field="contentTypeId" />
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="revision"/>
<set field="title" value="Content Revision Edit Page"/>
@@ -161,6 +183,12 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
+ <set from-field="rootContentId" field="contentId" />
+ <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ <set from-field="content.contentTypeId" field="contentTypeId" />
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="revision"/>
<set field="title" value="Content Revision List Page"/>
@@ -186,6 +214,12 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
+ <set from-field="rootContentId" field="contentId" />
+ <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ <set from-field="content.contentTypeId" field="contentTypeId" />
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="revision"/>
<set field="title" value="Content Revision Item Edit Page"/>
@@ -268,6 +302,8 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
<set field="menuName" value="tree"/>
<set field="entityName" value="ContentAssocViewFrom"/>
<set field="queryString" from-field="result.queryString"/>
@@ -276,7 +312,7 @@
<set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
<set field="contentTypeId" value="COMPDOC_TEMPLATE"/>
<entity-and entity-name="Content" list-name="compDocFindList">
- <field-map field-name="instanceOfContentId" env-name="parameters.contentId"/>
+ <field-map field-name="instanceOfContentId" env-name="parameters.rootContentId"/>
<field-map field-name="contentTypeId" value="COMPDOC_INSTANCE"/>
</entity-and>
<set field="title" value="View CompDoc Instances of ${parameter.contentId}"/>
@@ -298,13 +334,22 @@
<actions>
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="edit"/>
-
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId" />
+ <set from-field="contentId" field="rootContentId"/>
<entity-one entity-name="Content" value-name="content" use-cache="false"/>
<entity-one entity-name="DataResource" value-name="dataResource" use-cache="false">
<field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
</entity-one>
<set from-field="dataResource.mimeTypeId" field="mimeTypeId"/>
<set from-field="content.contentTypeId" field="contentTypeId"/>
+ <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
+ </condition-list>
+ <order-by field-name="-contentRevisionSeqId"/>
+ </entity-condition>
+ <set from-field="parameters.contentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="contentRevisionSeqId" />
+ <set from-field="contentRevisionSeqId" field="rootContentRevisionSeqId"/>
</actions>
<widgets>
@@ -313,13 +358,16 @@
<if-compare field-name="contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
</condition>
<actions>
- <set field="title" value="Edit CompDoc Template [${parameters.contentId}]"/>
+ <set field="title" value="Edit CompDoc Template [${rootContentId}]"/>
<set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootTemplateRevSeqId}" field="rootTemplateRevSeqId"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <container><link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/></container>
+ <container>
+ <link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/>
+ <link target="ViewInstances?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
+ </container>
<include-form name="EditRootCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -354,14 +402,11 @@
<set field="menuName" value="subtree"/>
<set field="currentMenuItemName" value="edit"/>
<set from-field="parameters.contentId" field="itemContentId"/>
- <set from-field="parameters.caContentId" field="contentId"/>
+ <set from-field="parameters.caContentIdTo" default-value="${parameters.rootContentId}" field="contentId"/>
+ <set from-field="parameters.rootContentId" default-value="${parameters.caContentIdTo}" field="rootContentId"/>
<entity-one entity-name="Content" value-name="itemContent" use-cache="false">
<field-map field-name="contentId" env-name="itemContentId"/>
</entity-one>
- <entity-one entity-name="DataResource" value-name="dataResource" use-cache="false">
- <field-map field-name="dataResourceId" env-name="itemContent.dataResourceId"/>
- </entity-one>
- <set from-field="dataResource.mimeTypeId" field="mimeTypeId"/>
<entity-one entity-name="ContentAssoc" value-name="contentAssoc">
<field-map field-name="contentIdTo" env-name="parameters.caContentIdTo"/>
<field-map field-name="contentId" env-name="parameters.contentId"/>
@@ -370,13 +415,29 @@
</entity-one>
<entity-condition entity-name="ContentRevisionItem" list-name="contentRevisionItems" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="contentId" env-name="parameters.caContentIdTo" operator="equals"/>
- <condition-expr field-name="contentId" env-name="parameters.contentId" operator="equals"/>
+ <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
+ <condition-expr field-name="itemContentId" env-name="itemContentId" operator="equals"/>
<condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
- <set from-field="parameters.itemContentRevisionSeqId" default-value="${contentRevisionItems[0].contentRevisionSeqId}" field="itemContentRevisionSeqId" global="true"/>
+ <set from-field="parameters.itemContentRevisionSeqId" default-value="${contentRevisionItems[0].contentRevisionSeqId}" field="itemContentRevisionSeqId"/>
+ <set from-field="contentRevisionItems[0].newDataResourceId" default-value="${itemContent.dataResourceId}" field="dataResourceId" />
+ <entity-one entity-name="DataResource" value-name="dataResource" use-cache="false">
+ <field-map field-name="dataResourceId" env-name="dataResourceId"/>
+ </entity-one>
+ <set from-field="dataResource.mimeTypeId" field="mimeTypeId"/>
+
+ <!-- need to get the latest rootContentRevisionSeqId -->
+ <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
+ <condition-expr field-name="contentRevisionSeqId" env-name="itemContentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
+ </condition-list>
+ <order-by field-name="-contentRevisionSeqId"/>
+ </entity-condition>
+ <set from-field="contentRevisions[0].contentRevisionSeqId" default-value="${}" field="rootContentRevisionSeqId" />
+
</actions>
<widgets>
<section>
@@ -384,10 +445,9 @@
<if-compare field-name="itemContent.contentTypeId" operator="equals" value="TEMPLATE"/>
</condition>
<actions>
- <set field="title" value="Edit CompDoc Template Part [${parameters.itemContentId}]"/>
+ <set field="title" value="Edit CompDoc Template Part [${itemContentId} of ${rootContentId}]"/>
<set value="updateChildCompDocTemplate" field="childCompDocTarget"/>
<set value="TEMPLATE" field="contentTypeId"/>
- <set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootTemplateRevSeqId}" field="rootTemplateRevSeqId"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -419,7 +479,7 @@
<if-compare field-name="itemContent.contentTypeId" operator="equals" value="DOCUMENT"/>
</condition>
<actions>
- <set field="title" value="Edit CompDoc Instance Part [${parameters.itemContentId}]"/>
+ <set field="title" value="Edit CompDoc Instance Part [${itemContentId} of ${contentId}]"/>
<set value="updateChildCompDocInstance" field="childCompDocTarget"/>
<set value="DOCUMENT" field="contentTypeId"/>
<!--
@@ -462,7 +522,6 @@
</condition>
-->
<actions>
- <set from-field="dummy.rootInstanceContentId" field="dummy.rootContentId"/>
</actions>
<widgets>
<include-screen name="ContentViewLink"/>
@@ -499,7 +558,7 @@
<actions>
</actions>
<widgets>
- <container><link target="ViewCompDocContentBinary?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${dummy.rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
+ <container><link target="ViewCompDocContentBinary?contentId=${itemContentId}&contentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
</widgets>
</section>
<section>
@@ -512,7 +571,7 @@
<actions>
</actions>
<widgets>
- <container><link target="ViewCompDocContentHtml?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
+ <container><link target="ViewCompDocContentHtml?contentId=${itemContentId}&contentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
</widgets>
</section>
<section>
@@ -529,7 +588,7 @@
<actions>
</actions>
<widgets>
- <container><link target="ViewCompDocContentSurvey?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
+ <container><link target="ViewCompDocContentSurvey?contentId=${itemContentId}&contentRevisionSeqId=${itemContentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
</widgets>
</section>
<section>
@@ -690,10 +749,23 @@
<if-has-permission permission="CONTENTMGR" action="CREATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
+ <set value="COMPDOC_INSTANCE" field="contentTypeId" />
+ <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
+ </condition-list>
+ <order-by field-name="-contentRevisionSeqId"/>
+ </entity-condition>
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="rootContentRevisionSeqId" />
+ <entity-one entity-name="Content" value-name="templateContent">
+ <field-map field-name="contentId" env-name="rootContentId"/>
+ </entity-one>
+ <set from-field="templateContent.contentName" field="contentName"/>
+
<set field="menuName" value="tree"/>
- <set field="title" value="Add Composite Document Instance Page"/>
- <set value="COMPDOC_INSTANCE" field="contentTypeId" />
- <set value="" field="dummy2.contentId" />
+ <set field="title" value="Add Composite Document Instance Page for Template: ${rootContentId}"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -713,7 +785,7 @@
<actions>
<set field="menuName" value="tree"/>
<set field="title" value="Add Composite Document Template Page"/>
- <set value="COMPDOC_TEMPLATE" field="dummy.contentTypeId"/>
+ <set value="COMPDOC_TEMPLATE" field="contentTypeId"/>
<set value="createChildCompDocTemplate" field="createChildCompDoc"/>
</actions>
<widgets>
@@ -768,10 +840,11 @@
<set field="menuName" value="tree"/>
<set field="title" value="Add Composite Document Template Part Page"/>
<set field="contentIdTo" from-field="parameters.caContentIdTo" default-value="${parameters.contentIdTo}"/>
+ <set field="rootContentId" from-field="contentIdTo"/>
+ <set field="rootContentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId"/>
<set field="contentAssocTypeId" value="COMPDOC_PART"/>
<set field="sequenceNum" from-field="parameters.caSequenceNum" default-value="${parameters.sequenceNum}"/>
<set field="contentTypeId" value="TEMPLATE"/>
- <set field="rootInstanceContentId" value=""/>
<set field="contentId" value=""/>
<set field="instanceOfDataResourceTypeId" value=""/>
<set field="childCompDocTarget" value="createChildCompDocTemplate"/>
@@ -793,17 +866,29 @@
</condition>
<actions>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
+ <set value="COMPDOC_TEMPLATE" field="contentTypeId" />
+ <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
+ </condition-list>
+ <order-by field-name="-contentRevisionSeqId"/>
+ </entity-condition>
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="rootContentRevisionSeqId" />
+
<set field="menuName" value="tree"/>
<set field="title" value="Composite Document Root Template View Page"/>
<set field="currentMenuItemName" value="viewtree"/>
- <set from-field="parameters.contentId" field="rootContentId" />
- <set value="COMPDOC_TEMPLATE" field="contentTypeId" />
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml" >
<decorator-section name="body">
- <container><link target="AddRootCompDocInstance?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/></container>
+ <container>
+ <link target="ViewInstances?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="View Instances" style="buttontext"/>
+ <link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/>
+ </container>
<include-tree name="CompDocTemplateTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/>
</decorator-section>
</decorator-screen>
@@ -819,27 +904,29 @@
<actions>
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="viewtree2"/>
- <set from-field="parameters.contentId" field="instanceContentId"/>
+ <set from-field="parameters.rootContentId" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
+ <set value="COMPDOC_INSTANCE" field="contentTypeId" />
<entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="contentId" env-name="parameters.contentId" operator="equals"/>
- <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
+ <condition-expr field-name="contentId" env-name="rootContentId" operator="equals"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
- <set field="instanceContentRevisionSeqId" from-field="parameters.contentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}"/>
- <entity-one entity-name="Content" value-name="instanceContent"/>
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="rootContentRevisionSeqId" />
+
+ <entity-one entity-name="Content" value-name="instanceContent">
+ <field-map field-name="contentId" env-name="rootContentId"/>
+ </entity-one>
<set from-field="instanceContent.instanceOfContentId" field="templateContentId"/>
<entity-condition entity-name="ContentRevision" list-name="contentTemplateRevisions" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="contentId" env-name="templateContentId" operator="equals"/>
- <condition-expr field-name="contentRevisionSeqId" env-name="instanceContentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
<set field="templateContentRevisionSeqId" from-field="contentTemplateRevisions[0].contentRevisionSeqId"/>
- <set value="COMPDOC_INSTANCE" field="contentTypeId" />
- <set field="title" value="Composite Document Root Instance View Page for Id: ${parameters.contentId} instance of ${instanceContent.instanceOfContentId}"/>
+ <set field="title" value="Composite Document Root Instance View Page for Id: ${rootContentId} instance of ${instanceContent.instanceOfContentId}"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -888,11 +975,11 @@
-->
<entity-condition entity-name="ContentAssocRevisionItemView" use-cache="false" list-name="assocRevisionItemViewList" >
<condition-list combine="and">
- <condition-expr field-name="contentIdTo" operator="equals" env-name="instanceContentId" />
- <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="instanceContentId" />
+ <condition-expr field-name="contentIdTo" operator="equals" env-name="rootContentId" />
+ <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId" />
<condition-expr field-name="instanceOfContentId" operator="equals" env-name="contentId" />
<condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="instanceContentRevisionSeqId" />
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" />
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
<condition-expr field-name="thruDate" operator="equals" value=""/>
@@ -920,6 +1007,16 @@
</entity-one>
</actions>
<widgets>
+ <!--
+ <label text="rootRevisionContentId : ${rootRevisionContentId}"></label>
+ <label text="itemContentId : ${itemContentId}"></label>
+ <label text="maxRevisionSeqId : ${maxRevisionSeqId}"></label>
+ <label text="contentIdTo : ${contentIdTo}"></label>
+ <label text="fromDate : ${fromDate}"></label>
+ <label text="instanceContentId : ${instanceContentId}"></label>
+ <label text="instanceContentRevisionSeqId : ${instanceContentRevisionSeqId}"></label>
+ <label text="assocRevisionItemView : ${assocRevisionItemView}"></label>
+ -->
<include-menu name="childInstanceLine" location="component://content/widget/compdoc/CompDocMenus.xml"/>
</widgets>
</section>
Modified: trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-03-01 21:02:03 UTC (rev 6877)
+++ trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-03-01 23:08:15 UTC (rev 6878)
@@ -31,7 +31,7 @@
<condition-list combine="and">
<condition-expr field-name="contentIdTo" operator="equals" env-name="rootContentId" />
<condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="contentRevisionSeqId" />
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" ignore-if-null="true"/>
<condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
@@ -66,7 +66,7 @@
<condition-expr field-name="contentIdTo" operator="equals" env-name="contentId" />
<condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId" />
<condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootTemplateRevSeqId" />
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" />
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
<condition-expr field-name="thruDate" operator="equals" value=""/>
More information about the Svn
mailing list