[OFBiz] SVN: r6661 - in trunk/applications/content: script/org/ofbiz/content/compdoc servicedef webapp/content/WEB-INF widget/compdoc
byersa@svn.ofbiz.org
byersa at svn.ofbiz.org
Thu Feb 2 01:59:55 CST 2006
Author: byersa
Date: 2006-02-02 01:59:45 -0600 (Thu, 02 Feb 2006)
New Revision: 6661
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/compdoc/CompDocForms.xml
trunk/applications/content/widget/compdoc/CompDocMenus.xml
trunk/applications/content/widget/compdoc/CompDocScreens.xml
Log:
Starting to get CompDoc screens per spec. Not much to demo at this point.
Modified: trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
===================================================================
--- trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-02-02 07:53:40 UTC (rev 6660)
+++ trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-02-02 07:59:45 UTC (rev 6661)
@@ -29,8 +29,134 @@
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+
+ <simple-method method-name="genCompDocInstance" short-description="Create CompDoc">
+
+ <entity-one entity-name="Content" value-name="rootTemplateContent">
+ <field-map field-name="contentId" env-name="parameters.rootTemplateContentId"/>
+ </entity-one>
+
+ <if-empty field-name="parameters.contentRevisionSeqId">
+ <entity-condition entity-name="ContentRevision" list-name="contentRevisionList">
+ <condition-list>
+ <condition-expr field-name="contentId" operator="equals" env-name="parameters.rootTemplateContentId"/>
+ </condition-list>
+ <order-by field-name="-contentRevisionSeqId"/>
+ </entity-condition>
+ <if-not-empty field-name="contentRevisionList">
+ <set from-field="contentRevisionList[0].contentRevisionSeqId" field="contentRevisionSeqId"/>
+ <else>
+ <set value="" field="contentRevisionSeqId"/>
+ </else>
+ </if-not-empty>
+ <else>
+ <set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId" />
+ </else>
+ </if-empty>
+
+ <make-value entity-name="Content" value-name="rootInstanceContent"/>
+ <if-empty field-name="parameters.rootInstanceContentId">
+ <make-next-seq-id seq-field-name="contentId" value-name="rootInstanceContent"/>
+ <else>
+ <entity-one entity-name="Content" value-name="existingContent">
+ <field-map field-name="contentId" env-name="parameters.rootInstanceContentId"/>
+ </entity-one>
+ <if-not-empty field-name="existingContent">
+ <add-error>
+ <fail-message message="Instance compdoc Content for ${parameters.rootInstanceContentId} already exists"/>
+ </add-error>
+ <check-errors/>
+ </if-not-empty>
+ <set from-field="parameters.rootInstanceContentId" field="rootInstanceContent.contentId"/>
+ </else>
+ </if-empty>
+ <set from-field="parameters.contentName" field="rootInstanceContent.contentName" default-value="rootTemplateContent.contentName"/>
+ <now-timestamp-to-env env-name="nowTimestamp"/>
+ <set from-field="nowTimestamp" field="rootInstanceContent.createdDate"/>
+ <set from-field="nowTimestamp" field="rootInstanceContent.lastModifiedDate"/>
+ <set from-field="rootInstanceContent.createdByUserLogin" field="parameters.userLogin.userLoginId"/>
+ <set from-field="rootInstanceContent.lastModifiedByUserLogin" field="parameters.userLogin.userLoginId"/>
+ <set value="COMPDOC_INSTANCE" field="rootInstanceContent.contentTypeId"/>
+ <create-value value-name="rootInstanceContent"/>
+
+ <field-to-result result-name="rootInstanceContentId" field-name="rootInstanceContent.contentId"/>
+
+ <set from-field="parameters.rootTemplateContentId" field="parentTemplateContentId"/>
+ <set from-field="rootInstanceContent.contentId" field="parentInstanceContentId"/>
+
+ <call-simple-method method-name="genInstanceChildCompDocs"/>
+
+ </simple-method>
+
+ <simple-method method-name="genInstanceChildCompDocs" short-description="Create CompDoc">
+
+ <set from-field="parentTemplateContentId" field="thisTemplateContentId"/>
+ <set from-field="parentInstanceContentId" field="thisInstanceContentId"/>
+ <entity-condition entity-name="ContentAssoc" list-name="contentAssocList">
+ <condition-list combine="and" >
+ <condition-expr field-name="contentIdTo" operator="equals" env-name="thisTemplateContentId" />
+ <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
+ <condition-list combine="or">
+ <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="equals" value=""/>
+ </condition-list>
+ </condition-list>
+ </entity-condition>
+
+ <iterate list-name="contentAssocList" entry-name="templateContentAssoc">
+ <clone-value value-name="templateContent" new-value-name="instanceContent"/>
+ <make-next-seq-id seq-field-name="contentId" value-name="instanceContent"/>
+ <set value="TEMPLATE" field="instanceContent.contentTypeId"/>
+ <create-value value-name="instanceContent"/>
+
+ <make-value entity-name="ContentAssoc" value-name="instanceContentAssoc"/>
+ <set from-field="thisInstanceContentId" field="instanceContentAssoc.contentIdTo" />
+ <set from-field="instanceContent.contentId" field="instanceContentAssoc.contentId" />
+ <set value="COMPDOC_PART" field="instanceContentAssoc.contentAssocTypeId" />
+ <set from-field="nowTimestamp" field="instanceContentAssoc.fromDate"/>
+ <create-value value-name="instanceContent"/>
+
+ <!-- recursively call this method -->
+ <set from-field="templateContentAssoc.contentId" field="parentTemplateContentId"/>
+ <set from-field="instanceContent.contentId" field="parentInstanceContentId"/>
+ <call-simple-method method-name="genInstanceChildCompDocs"/>
+ </iterate>
+
+ </simple-method>
+
+ <simple-method method-name="persistRootCompDoc" short-description="Create CompDoc">
+
+ <if-not-empty field-name="parameters.contentId">
+ <entity-one entity-name="Content" value-name="content"/>
+ <if-not-empty field-name="content">
+ <add-error>
+ <fail-message message="Compdoc Content for ${parameters.contentId} already exists"/>
+ </add-error>
+ <check-errors/>
+ </if-not-empty>
+ </if-not-empty>
+
+ <!-- create the compdoc Content entity -->
+ <set-service-fields service-name="persistContentAndAssoc" map-name="parameters" to-map-name="persistMap"/>
+ <set from-field="parameters.userLogin" field="persistMap.userLogin"/>
+ <call-service service-name="persistContentAndAssoc" in-map-name="persistMap">
+ <results-to-map map-name="pResults"/>
+ </call-service>
+ <!-- put all the result fields in this service's result -->
+ <iterate-map map-name="pResults" key-name="key" value-name="val">
+ <field-to-result field-name="pResults.${key}" result-name="${key}"/>
+ </iterate-map>
+ <log level="info" message="pResults : ${pResults}"/>
+
+ <set from-field="pResults.contentId" field="revisionMap.itemContentId"/>
+ <set from-field="pResults.contentId" field="revisionMap.contentId"/>
+ <set from-field="parameters.userLogin" field="revisionMap.userLogin"/>
+ <call-service service-name="persistContentRevisionAndItem" in-map-name="revisionMap">
+ <result-to-result result-name="contentRevisionSeqId"/>
+ </call-service>
+ </simple-method>
+
<!-- Methods for ContentApproval -->
-
<simple-method method-name="createContentApproval" short-description="Create ContentApproval">
<log level="always" message="got into createContentApproval(4)"></log>
<check-permission action="_CREATE" permission="CONTENTMGR">
Modified: trunk/applications/content/servicedef/services.xml
===================================================================
--- trunk/applications/content/servicedef/services.xml 2006-02-02 07:53:40 UTC (rev 6660)
+++ trunk/applications/content/servicedef/services.xml 2006-02-02 07:59:45 UTC (rev 6661)
@@ -1814,7 +1814,7 @@
<!-- ================ CompDoc Requests ================= -->
<service name="persistContentRevisionAndItem" engine="simple"
location="org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="persistContentRevisionAndItem" auth="false">
+ invoke="persistContentRevisionAndItem" auth="true">
<description>Update a ContentRevision and ContentRevisionItem</description>
<auto-attributes entity-name="ContentRevision" include="all" mode="IN" optional="true">
</auto-attributes>
@@ -1854,7 +1854,7 @@
<service name="prepForApproval" engine="simple"
location="org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="prepForApproval" auth="false">
+ invoke="prepForApproval" auth="true">
<description>Set ContentApprovals for approval process</description>
<attribute name="rootTemplateContentId" type="String" mode="IN" optional="false"/>
<attribute name="templateContentRevisionSeqId" type="String" mode="OUT" optional="false"/>
@@ -1865,7 +1865,7 @@
<service name="checkForOpenApprovals" engine="simple"
location="org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="prepForApproval" auth="false">
+ invoke="prepForApproval" auth="true">
<description>Set ContentApprovals for approval process</description>
<attribute name="rootTemplateContentId" type="String" mode="IN" optional="false"/>
<attribute name="openApprovalExists" type="Boolean" mode="OUT" optional="false"/>
@@ -1873,7 +1873,7 @@
<service name="getApprovalsWithPermissions" engine="simple"
location="org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="getApprovalsWithPermissions" auth="false" >
+ invoke="getApprovalsWithPermissions" auth="true" >
<description>Get a list of ContentApprovals and permission indicators</description>
<attribute name="rootContentId" type="String" mode="IN" optional="false"/>
<attribute name="contentRevisionSeqId" type="String" mode="IN" optional="false"/>
@@ -1883,11 +1883,27 @@
<service name="hasApprovalPermission" engine="simple"
location="org/ofbiz/content/compdoc/CompDocServices.xml"
- invoke="hasApprovalPermission" auth="false">
+ invoke="hasApprovalPermission" auth="true">
<description>Determine permission status for record</description>
<attribute name="contentApprovalId" type="String" mode="IN" optional="false"/>
<attribute name="userLogin" type="org.ofbiz.entity.GenericValue" mode="IN" optional="false"/>
<attribute name="approvalPermExists" type="String" mode="OUT" optional="true"/>
</service>
+ <service name="genCompDocInstance" engine="simple"
+ location="org/ofbiz/content/compdoc/CompDocServices.xml"
+ invoke="genCompDocInstance" auth="true">
+ <description>Generate parallel CompDoc Instance tree</description>
+ <attribute name="rootTemplateContentId" type="String" mode="IN" optional="false"/>
+ <attribute name="rootInstanceContentId" type="String" mode="INOUT" optional="false"/>
+ </service>
+
+ <service name="persistRootCompDoc" engine="simple"
+ location="org/ofbiz/content/compdoc/CompDocServices.xml"
+ invoke="persistRootCompDoc" auth="true">
+ <description>Create a CompDoc Template entity and associated ContentRevision/Item entities</description>
+ <implements service="persistContentAndAssoc"/>
+ <attribute name="contentRevisionSeqId" type="String" mode="OUT" optional="false"/>
+ </service>
+
</services>
Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-02-02 07:53:40 UTC (rev 6660)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-02-02 07:59:45 UTC (rev 6661)
@@ -979,6 +979,41 @@
<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="EditRootCompDocInstance">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="EditRootCompDocInstance"/>
+ </request-map>
+ <request-map uri="EditRootCompDocTemplate">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="EditRootCompDocTemplate"/>
+ </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>
+ <request-map uri="EditChildCompDocInstance">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="EditChildCompDocInstance"/>
+ </request-map>
+ <request-map uri="EditChildCompDocTemplate">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="EditChildCompDocTemplate"/>
+ </request-map>
+
<request-map uri="createCompDocTemplate">
<security auth="true" https="true"/>
<event invoke="persistContentAndAssoc" path="" type="service"/>
@@ -997,18 +1032,24 @@
<response name="success" type="view" value="EditChildCompDoc"/>
<response name="error" type="view" value="EditChildCompDoc"/>
</request-map>
- <request-map uri="updateRootCompDoc">
+ <request-map uri="updateRootCompDocTemplate">
<security auth="true" https="true"/>
- <event invoke="persistContentAndAssoc" path="" type="service"/>
- <response name="success" type="view" value="EditRootCompDoc"/>
- <response name="error" type="view" value="EditRootCompDoc"/>
+ <event invoke="persistRootCompDoc" path="" type="service"/>
+ <response name="success" type="view" value="EditRootCompDocTemplate"/>
+ <response name="error" type="view" value="EditRootCompDocTemplate"/>
</request-map>
- <request-map uri="createRootCompDoc">
+ <request-map uri="createRootCompDocTemplate">
<security auth="true" https="true"/>
- <event invoke="persistRootCompDoc" path="org.ofbiz.content.compdoc.CompDocEvents" type="java"/>
- <response name="success" type="view" value="EditRootCompDoc"/>
- <response name="error" type="view" value="EditRootCompDoc"/>
+ <event invoke="persistRootCompDoc" path="" type="service"/>
+ <response name="success" type="view" value="EditRootCompDocTemplate"/>
+ <response name="error" type="view" value="AddRootCompDocTemplate"/>
</request-map>
+ <request-map uri="genCompDocInstance">
+ <security auth="true" https="true"/>
+ <event invoke="genCompDocInstance" path="" type="service"/>
+ <response name="success" type="view" value="EditRootCompDocInstance"/>
+ <response name="error" type="view" value="AddCompDocInstance"/>
+ </request-map>
<!-- ================ CompDoc ContentRole Requests ================= -->
<request-map uri="EditCompDocContentRole">
@@ -1656,11 +1697,22 @@
<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"/>
+
+ <view-map name="EditChildCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#EditChildCompDocInstance" type="screen"/>
+ <view-map name="EditChildCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#EditChildCompDocTemplate" type="screen"/>
+ <view-map name="AddChildCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocInstance" type="screen"/>
+ <view-map name="AddChildCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocTemplate" type="screen"/>
+
+ <view-map name="EditRootCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDocInstance" type="screen"/>
+ <view-map name="EditRootCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDocTemplate" type="screen"/>
+ <view-map name="AddRootCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocInstance" type="screen"/>
+ <view-map name="AddRootCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocTemplate" type="screen"/>
+
<view-map name="ViewCompDocTemplateTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocTemplateTree" type="screen"/>
<view-map name="ViewCompDocInstanceTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocInstanceTree" type="screen"/>
<view-map name="ViewCompDocTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocTree" type="screen"/>
<view-map name="EditCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocInstance" type="screen"/>
+ <view-map name="EditCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocTemplate" type="screen"/>
<view-map name="CompDocTemplateTree" page="component://content/widget/compdoc/CompDocScreens.xml#CompDocTemplateTree" type="screen"/>
<view-map name="EditCompDocContent" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocContent" type="screen"/>
<view-map name="EditRootCompDocContent" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDocContent" type="screen"/>
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-02 07:53:40 UTC (rev 6660)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-02 07:59:45 UTC (rev 6661)
@@ -33,7 +33,7 @@
<field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="FindCompDocRoot" default-title-style="tableheadtext"
+ <form name="FindCompDoc" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
default-entity-name="Content"
target="ListCompDoc" title=" " type="single" >
@@ -45,21 +45,26 @@
<option key="COMPDOC_INSTANCE" description="Instance"/>
</radio>
</field>
+ <!--
<field name="rootonly" map-name="dummy" title="Root CompDocs Only" >
<check/>
</field>
+ -->
<field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListCompDocRoot" default-title-style="tableheadtext" default-tooltip-style="tabletext"
+ <form name="ListCompDoc" default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="tabletext" title="" type="list" list-name="compDocFindList"
- target="" paginate-target="ListCompDocRoot">
+ target="" paginate-target="ListCompDoc">
<field name="contentId" title="Content Id" ><display/></field>
<field name="contentTypeId" title="Content Type Id" ><display/></field>
<field name="contentName" title="Name" ><display/></field>
- <field name="edit" title="" >
+ <field name="edit" title="" use-when="contentTypeId.equals("COMPDOC_TEMPLATE")" >
<hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
</field>
+ <field name="edit" title="" use-when="contentTypeId.equals("COMPDOC_INSTANCE")" >
+ <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
+ </field>
<field name="tree" title="" use-when="contentTypeId.equals("COMPDOC_TEMPLATE")">
<hyperlink also-hidden="false" description="Tree" target="ViewCompDocTemplateTree?rootTemplateContentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
</field>
@@ -68,26 +73,6 @@
</field>
</form>
- <form name="ListCompDoc" default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="tabletext" title="" type="list" list-name="compDocFindList"
- target="" paginate-target="ListCompDocRoot">
- <field name="contentId" title="Content Id" ><display/></field>
- <field name="contentTypeId" title="Content Type Id" ><display/></field>
- <field name="contentName" title="Name" ><display/></field>
- <field name="caContentIdTo" title="Content Id To" ><display/></field>
- <field name="caContentAssocTypeId" title="Content Assoc Type ID" ><display/></field>
- <field name="caFromDate" title="From Date" ><display/></field>
- <field name="caThruDate"><hidden/></field>
- <!--
- <field name="edit" title="" use-when="contentTypeId.equals("COMPDOC_TEMPLATE")">
- <hyperlink also-hidden="false" description="Edit" target="EditRootTemplateCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
- </field>
- -->
- <field name="edit" title="" >
- <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
- </field>
- </form>
-
<form name="ListCompDocTemplate" default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="tabletext" title="" type="list" list-name="compDocFindList"
target="" paginate-target="ListCompDocTemplate">
@@ -240,15 +225,15 @@
<field name="contentTypeId" entry-name="currentContentTypeId" map-name="dummy"
use-when="content==null || (content != null && org.ofbiz.base.util.UtilValidate.isEmpty(content.getString("contentTypeId")))" >
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
- <option key="COMPDOC_TEMPLATE" description="Template"/>
- <option key="COMPDOC_INSTANCE" description="Instance"/>
- </drop-down>
+ <option key="COMPDOC_TEMPLATE" description="CompDoc Template"/>
+ <option key="COMPDOC_INSTANCE" description="CompDoc Instance"/>
+ </drop-down>
</field>
<field name="contentTypeId" map-name="content"
use-when="content != null " >
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
- <option key="COMPDOC_TEMPLATE" description="Template"/>
- <option key="COMPDOC_INSTANCE" description="Instance"/>
+ <option key="COMPDOC_TEMPLATE" description="CompDoc Template"/>
+ <option key="COMPDOC_INSTANCE" description="CompDoc Instance"/>
</drop-down>
</field>
<field name="ownerContentId" field-name="ownerContentId" map-name="content"
@@ -334,10 +319,73 @@
<field name="upperCoordinate" ><text/></field>
<field name="leftCoordinate" ><text/></field>
+ <field name="contentTypeId" entry-name="currentContentTypeId" map-name="dummy"
+ use-when="content==null || (content != null && org.ofbiz.base.util.UtilValidate.isEmpty(content.getString("contentTypeId")))" >
+ <drop-down no-current-selected-key="COMPDOC_TEMPLATE">
+ <option key="TEMPLATE" description="Member Template"/>
+ <option key="DOCUMENT" description="Document"/>
+ </drop-down>
+ </field>
+ <field name="contentTypeId" map-name="content"
+ use-when="content != null " >
+ <drop-down no-current-selected-key="COMPDOC_TEMPLATE">
+ <option key="TEMPLATE" description="Member Template"/>
+ <option key="DOCUMENT" description="Document"/>
+ </drop-down>
+ </field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="AddRootCompDocInstance" default-map-name="" title="" type="single" target="genCompDocInstance"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+
+ <field name="contentId"><text/></field>
+ <field name="contentName"><text/></field>
+ <field name="rootTemplateContentId" entry-name="instanceOfContentId" map-name="parameters"><hidden/></field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="AddRootCompDocTemplate" default-map-name="" title="" type="single" target="createRootCompDocTemplate"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+
+ <field name="contentId"><text/></field>
+ <field name="contentName"><text/></field>
+ <field name="contentTypeId" ><hidden value="COMPDOC_TEMPLATE"/></field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="EditRootCompDocTemplate" default-map-name="" title="" type="single" target="updateRootCompDocTemplate"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+
+ <field name="contentId"><text/></field>
+ <field name="contentName"><text/></field>
+ <field name="contentTypeId" ><hidden value="COMPDOC_TEMPLATE"/></field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="AddChildCompDocTemplate" default-map-name="" title="" type="single" target="createChildCompDocTemplate"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+
+ <field name="contentId"><text/></field>
+ <field name="contentName"><text/></field>
+ <field name="contentTypeId" ><hidden value="TEMPLATE"/></field>
+ <field name="contentIdTo" ><display/></field>
+ <field name="contentAssocTypeId" ><display/></field>
+ <field name="fromDate" ><display/></field>
+ <field name="thruDate" ><date-time/></field>
+ <field name="sequenceNum" ><text/></field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="EditChildCompDocTemplate" default-map-name="" title="" type="single" target="updateChildCompDocTemplate"
+ default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+
+ <field name="contentId"><text/></field>
+ <field name="contentName"><text/></field>
+ <field name="contentTypeId" ><hidden value="TEMPLATE"/></field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
<!-- ================ CompDoc Requests ================= -->
<form name="EditContentRevisionAndItem" target="updateContentRevisionAndItem" title="" type="single"
Modified: trunk/applications/content/widget/compdoc/CompDocMenus.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-02-02 07:53:40 UTC (rev 6660)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-02-02 07:59:45 UTC (rev 6661)
@@ -88,6 +88,29 @@
</menu>
+ <menu name="treecdt" default-title-style="tabButton"
+ default-selected-style="tabButtonSelected"
+ default-menu-item-name="content"
+ orientation="horizontal"
+ menu-width="100%"
+ default-tooltip-style="tabletext" default-widget-style="tabButton"
+ selected-menuitem-context-field-name="currentMenuItemName"
+ title="" type="simple">
+ <menu-item name="viewtree" title="View Tree" >
+ <link target="ViewCompDocTemplateTree?contentRevisionSeqId=${currentContentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}"/>
+ </menu-item>
+ <menu-item name="editcd" title="Edit" >
+ <link target="EditRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ </menu-item>
+ <menu-item name="approval" title="Approvals" >
+ <link target="ListContentApproval?contentId=${contentId}&rootRevisionSeqId=${rootRevisionSeqId}"/>
+ </menu-item>
+ <menu-item name="rev-cdt" title="Template Revisions" >
+ <link target="ListTemplateRevisions?contentId=${contentId}&templateRevisionSeqId=${templateRevisionSeqId}"/>
+ </menu-item>
+
+ </menu>
+
<menu name="treeline" default-title-style="tabButton"
default-selected-style="tabButtonSelected"
default-menu-item-name="content"
@@ -128,20 +151,11 @@
<link target="EditRootCompDoc?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}"/>
</menu-item>
<menu-item name="child" title="+Child" >
- <link target="EditChildCompDoc?caContentIdTo=${contentId}&caSequenceNum=9999&currentContentTypeId=COMPDOC_TEMPLATE"/>
+ <link target="AddChildCompDocTemplate?caContentIdTo=${contentId}&caSequenceNum=9999&currentContentTypeId=COMPDOC_TEMPLATE"/>
</menu-item>
<menu-item name="addinst" title="Add Instance" >
- <condition>
- <if-empty field-name="rootInstanceContentId"/>
- </condition>
- <link target="EditRootCompDoc?contentId=${contentId}&instanceOfContentId=${contentId}&currentContentTypeId=COMPDOC_INSTANCE"/>
+ <link target="AddCompDocInstance?instanceOfContentId=${contentId}"/>
</menu-item>
- <menu-item name="editinst" title="Edit Instance" >
- <condition>
- <not><if-empty field-name="rootInstanceContentId"/></not>
- </condition>
- <link target="EditRootCompDoc?contentId=${rootInstanceContentId}&instanceOfContentId=${contentId}&currentContentTypeId=COMPDOC_INSTANCE"/>
- </menu-item>
</menu>
<menu name="rootInstanceLine" default-title-style="tabButton"
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-02 07:53:40 UTC (rev 6660)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-02 07:59:45 UTC (rev 6661)
@@ -199,15 +199,15 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="FindCompDocRoot" location="component://content/widget/compdoc/CompDocForms.xml"/>
- <link target="EditRootCompDoc?currentContentTypeId=COMPDOC_TEMPLATE" text="Create New Root Composite Document" style="buttontext"/>
+ <include-form name="FindCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ <link target="AddRootCompDocTemplate?currentContentTypeId=COMPDOC_TEMPLATE" text="Create New Root CompDoc Template" style="buttontext"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
+<!--
<screen name="ListCompDoc">
<section>
<condition>
@@ -273,6 +273,49 @@
</widgets>
</section>
</screen>
+-->
+ <screen name="ListCompDoc">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="empty"/>
+ <set field="title" value="List CompDoc"/>
+ <set field="entityName" value="ContentAssocViewFrom"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <script location="component://content/widget/getMenuContext.bsh"/>
+ <set field="currentContentMenuItemName" value="" />
+ <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-compare operator="not-equals" field-name="parameters.rootonly" value="Y"/>
+ </condition>
+ <actions>
+ <entity-condition entity-name="Content" list-name="compDocFindList">
+ <condition-list combine="and" >
+ <condition-expr field-name="contentName" operator="equals" env-name="parameters.contentName" ignore-if-empty="true"/>
+ <condition-expr field-name="contentId" operator="equals" env-name="parameters.contentId" ignore-if-empty="true"/>
+ <condition-expr field-name="contentTypeId" operator="equals" env-name="parameters.contentTypeId"/>
+ </condition-list>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <include-form name="ListCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ <link target="FindCompDocRoot" text="Find" />
+ <link target="EditCompDocTemplate" text="Create New" />
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditCompDoc">
<section>
@@ -406,6 +449,86 @@
</widgets>
</section>
</screen>
+ <screen name="EditCompDocTemplate">
+ <section>
+ <actions>
+ <script location="component://content/widget/getMenuContext.bsh"/>
+ <set field="menuName" value="tree"/>
+ <set field="title" value="Composite Document Root Template Edit Page"/>
+ <set field="titleProperty" value="PageTitleEditContent"/>
+ <set field="currentMenuItemName" value="editcd"/>
+ <set field="contentId" from-field="parameters.contentId"/>
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ <entity-condition entity-name="ContentAssoc" list-name="contentAssocList">
+ <condition-list combine="and">
+ <condition-expr field-name="contentId" operator="equals" env-name="contentId"/>
+ <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
+ </condition-list>
+ </entity-condition>
+ <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-list>
+ <order-by field-name="-contentRevisionSeqId"/>
+ </entity-condition>
+ <set field="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}"/>
+ <set field="instanceOfContentId" from-field="parameters.instanceOfContentId"/>
+ <set field="currentContentTypeId" value="COMPDOC_TEMPLATE"/>
+ <set field="dummy.currentContentTypeId" value="COMPDOC_TEMPLATE"/>
+ <set field="rootTemplateContentId" from-field="parameters.contentId"/>
+ <set field="rootInstanceContentId" value=""/>
+ </actions>
+ <widgets>
+
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="CompDocRoot" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditCompDocInstance">
+ <section>
+ <actions>
+ <script location="component://content/widget/getMenuContext.bsh"/>
+ <set field="menuName" value="tree"/>
+ <set field="title" value="Composite Document Root Template Edit Page"/>
+ <set field="titleProperty" value="PageTitleEditContent"/>
+ <set field="currentMenuItemName" value="editcd"/>
+ <set field="contentId" from-field="parameters.contentId"/>
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ <entity-condition entity-name="ContentAssoc" list-name="contentAssocList">
+ <condition-list combine="and">
+ <condition-expr field-name="contentId" operator="equals" env-name="contentId"/>
+ <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
+ </condition-list>
+ </entity-condition>
+ <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-list>
+ <order-by field-name="-contentRevisionSeqId"/>
+ </entity-condition>
+ <set field="contentRevisionSeqId" from-field="parameters.contentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}"/>
+ <set field="instanceOfContentId" from-field="parameters.instanceOfContentId"/>
+ <set field="currentContentTypeId" value="COMPDOC_INSTANCE"/>
+ <set field="dummy.currentContentTypeId" value="COMPDOC_INSTANCE"/>
+ <set field="rootInstanceContentId" from-field="content.contentId"/>
+ <set field="rootTemplateContentId" from-field="content.instanceOfContentId" default-value="${parameters.rootTemplateContentId}"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="CompDocRoot" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditChildCompDoc">
<section>
<actions>
@@ -448,54 +571,177 @@
</widgets>
</section>
</screen>
- <screen name="EditTemplateCompDoc">
+
+ <screen name="AddRootCompDocInstance">
<section>
<condition>
<if-has-permission permission="CONTENTMGR" action="CREATE"/>
</condition>
+ <actions>
+ <set field="menuName" value="treecdt"/>
+ <set field="title" value="Composite Document Instance Add Page"/>
+ <set from-field="parameters.instanceOfContentId" field="rootTemplateContentId" />
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="AddRootCompDocInstance" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditRootCompDocInstance">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="CREATE"/>
+ </condition>
<actions>
- <script location="component://content/widget/getMenuContext.bsh"/>
- <set field="menuName" value="tree"/>
+ <set field="menuName" value="treecdt"/>
<set field="title" value="Composite Document Template Edit Page"/>
- <set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentMenuItemName" value="editcd"/>
- <set field="contentId" from-field="parameters.contentId"/>
- <set field="contentIdTo" from-field="parameters.caContentIdTo"/>
- <set field="contentAssocTypeId" from-field="parameters.caContentAssocTypeId"/>
- <set field="fromDate" from-field="parameters.caFromDate"/>
- <set field="sequenceNum" from-field="parameters.caSequenceNum"/>
- <set field="rootTemplateContentId" from-field="parameters.rootTemplateContentId"/>
- <set field="rootInstanceContentId" from-field="parameters.rootInstanceContentId"/>
-
- <entity-one entity-name="Content" value-name="content"/>
- <entity-one entity-name="ContentAssoc" value-name="contentAssoc"/>
+ <set from-field="parameters.contentId" field="rootTemplateContentId" />
+ <set value="" field="rootInstanceContentId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <section>
- <condition>
- <not><if-empty field-name="contentId"/></not>
- </condition>
- <widgets>
- <include-form name="EditTemplateCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
- </widgets>
- </section>
- <section>
- <condition>
- <if-empty field-name="contentId"/>
- </condition>
- <widgets>
- <include-form name="AddTemplateCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
- </widgets>
- </section>
+ <include-form name="EditRootCompDocInstance" location="component://content/widget/compdoc/CompDocForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
+
+ <screen name="AddRootCompDocTemplate">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="CREATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="treecdt"/>
+ <set field="title" value="Composite Document Instance Add Page"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="AddRootCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditRootCompDocTemplate">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="CREATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="treecdt"/>
+ <set field="title" value="Composite Document Template Edit Page"/>
+ <set from-field="parameters.contentId" field="rootTemplateContentId" />
+ <set value="" field="rootInstanceContentId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="EditRootCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="AddChildCompDocInstance">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="CREATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="treecdt"/>
+ <set field="title" value="Composite Document Instance Add Page"/>
+ <set from-field="parameters.contentId" field="contentIdTo" />
+ <set from-field="nowTimestamp" field="fromDate" />
+ <set value="COMPDOC_PART" field="contentAssocTypeId" />
+ <set value="9999" field="sequenceNum" />
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="AddChildCompDocInstance" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditChildCompDocInstance">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="CREATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="treecdt"/>
+ <set field="title" value="Composite Document Template Edit Page"/>
+ <set from-field="parameters.contentId" field="rootTemplateContentId" />
+ <set value="" field="rootInstanceContentId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="EditChildCompDocInstance" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="AddChildCompDocTemplate">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="CREATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="treecdt"/>
+ <set field="title" value="Composite Document Instance Add Page"/>
+ <set from-field="parameters.instanceOfContentId" field="rootTemplateContentId" />
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="AddChildCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditChildCompDocTemplate">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="CREATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="treecdt"/>
+ <set field="title" value="Composite Document Template Edit Page"/>
+ <set from-field="parameters.contentId" field="rootTemplateContentId" />
+ <set value="" field="rootInstanceContentId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="EditChildCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="ViewCompDocTree">
<section>
<widgets>
@@ -544,9 +790,7 @@
<set field="titleProperty" value="PageTitleEditContent"/>
<set field="currentMenuItemName" value="viewtree"/>
<set field="contentId" from-field="parameters.rootTemplateContentId" />
- <set field="rootTemplateContentId" from-field="parameters.rootTemplateContentId" to-scope="user"/>
<set field="rootTemplateContentId" from-field="parameters.rootTemplateContentId" />
- <set field="rootInstanceContentId" value="" to-scope="user"/>
<set field="rootInstanceContentId" value="" />
<entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
<condition-list combine="and">
@@ -563,6 +807,7 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
+ <label text="rootTemplateContentId : ${rootTemplateContentId}"/>
<include-tree name="CompDocTemplateTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/>
</decorator-section>
</decorator-screen>
@@ -581,7 +826,6 @@
<set field="title" value="Composite Document Root Template Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
<set field="currentMenuItemName" value="viewtree"/>
- <set field="rootInstanceContentId" from-field="parameters.rootInstanceContentId" to-scope="user"/>
<set field="rootInstanceContentId" from-field="parameters.rootInstanceContentId" />
<entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
<condition-list combine="and">
@@ -595,7 +839,6 @@
<entity-one entity-name="Content" value-name="content" use-cache="true">
<field-map field-name="contentId" env-name="rootInstanceContentId"/>
</entity-one>
- <set field="rootTemplateContentId" from-field="content.instanceOfContentId" to-scope="user"/>
<set field="rootTemplateContentId" from-field="content.instanceOfContentId"/>
<set field="currentContentTypeId" value="COMPDOC_INSTANCE" to-scope="user"/>
@@ -603,42 +846,12 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-tree name="CompDocInstanceTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/>
+ <include-tree name="CompDocInstanceTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
- <screen name="EditCompDocInstance">
- <section>
- <condition>
- <if-has-permission permission="CONTENTMGR" action="CREATE"/>
- </condition>
- <actions>
- <set field="headerItem" value="Content"/>
- <script location="component://content/widget/getMenuContext.bsh"/>
- <set field="title" value="Composite Document Instance Edit Page"/>
- <set field="titleProperty" value="PageTitleEditContent"/>
- <set field="currentContentMenuItemName" value="AddContent" />
- <entity-one entity-name="Content" value-name="content"/>
- <entity-one entity-name="ContentAssoc" value-name="contentAssoc"/>
- <!--
- <service result-map-name="results" service-name="getRevisionDataResource">
- <field-map field-name="contentId" env-name="parameters.rootEntityId"/>
- <field-map field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId"/>
- <field-map field-name="itemContentId" env-name="contentId"/>
- </service>
- -->
- </actions>
- <widgets>
- <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
- <decorator-section name="body">
- <include-form name="EditCompDocInstance" location="component://content/widget/compdoc/CompDocForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="CompDocTemplateTree">
<section>
<condition>
More information about the Svn
mailing list