[OFBiz] SVN: r6696 - in trunk/applications/content: script/org/ofbiz/content/compdoc servicedef webapp/content/WEB-INF webapp/content/includes widget widget/compdoc
byersa@svn.ofbiz.org
byersa at svn.ofbiz.org
Mon Feb 6 17:47:01 CST 2006
Author: byersa
Date: 2006-02-06 17:46:53 -0600 (Mon, 06 Feb 2006)
New Revision: 6696
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/webapp/content/includes/header.ftl
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
Log:
Fixed the genCompDocInstance service so that root instances of a template compdoc
can be generated.
Took a different approach to passing root compdoc identifiers around -
set them all in the decorator screen and used a parent form to include
them in most forms.
Generally, the compdoc trees and edit screens work better.
Modified: trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
===================================================================
--- trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-02-06 23:46:53 UTC (rev 6696)
@@ -33,13 +33,13 @@
<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"/>
+ <field-map field-name="contentId" env-name="parameters.instanceOfContentId"/>
</entity-one>
-
+ <log message="genCompDocInstance> rootTemplateContent: ${rootTemplateContent}" level="info"/>
<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-expr field-name="contentId" operator="equals" env-name="parameters.instanceOfContentId"/>
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
@@ -53,10 +53,12 @@
<set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId" />
</else>
</if-empty>
+ <log message="genCompDocInstance> contentRevisionSeqId: ${contentRevisionSeqId}" level="info"/>
<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"/>
+ <log message="genCompDocInstance 2> rootInstanceContent: ${rootInstanceContent}"/>
<else>
<entity-one entity-name="Content" value-name="existingContent">
<field-map field-name="contentId" env-name="parameters.rootInstanceContentId"/>
@@ -70,21 +72,34 @@
<set from-field="parameters.rootInstanceContentId" field="rootInstanceContent.contentId"/>
</else>
</if-empty>
- <set from-field="parameters.contentName" field="rootInstanceContent.contentName" default-value="rootTemplateContent.contentName"/>
+ <set from-field="parameters.contentName" field="rootInstanceContent.contentName" default-value="${rootTemplateContent.contentName}"/>
<now-timestamp-to-env env-name="nowTimestamp"/>
+ <set from-field="parameters.instanceOfContentId" field="rootInstanceContent.instanceOfContentId"/>
<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"/>
+ <log message="genCompDocInstance 3> rootInstanceContent: ${rootInstanceContent}" level="info"/>
<field-to-result result-name="rootInstanceContentId" field-name="rootInstanceContent.contentId"/>
- <set from-field="parameters.rootTemplateContentId" field="parentTemplateContentId"/>
+ <set from-field="parameters.instanceOfContentId" field="parentTemplateContentId"/>
<set from-field="rootInstanceContent.contentId" field="parentInstanceContentId"/>
+ <log message="genCompDocInstance 4> parentTemplateContentId: ${parentTemplateContentId}" level="info"/>
+ <log message="genCompDocInstance 5> parentInstanceContentId: ${parentInstanceContentId}" level="info"/>
+ <set from-field="parentInstanceContentId" field="revisionMap.contentId"/>
+ <set from-field="parentInstanceContentId" field="revisionMap.itemContentId"/>
+ <set from-field="parameters.userLogin" field="revisionMap.userLogin"/>
+ <log level="info" message="revisionMap : ${revisionMap}"/>
+ <call-service service-name="persistContentRevisionAndItem" in-map-name="revisionMap">
+ <result-to-result result-name="contentRevisionSeqId"/>
+ </call-service>
+ <!-- This is for traversing tree and creating empty instance content entities
<call-simple-method method-name="genInstanceChildCompDocs"/>
+ -->
</simple-method>
@@ -92,6 +107,8 @@
<set from-field="parentTemplateContentId" field="thisTemplateContentId"/>
<set from-field="parentInstanceContentId" field="thisInstanceContentId"/>
+ <log message="genInstanceChildCompDocs 0> thisTemplateContentId: ${thisTemplateContentId}" level="info"/>
+ <log message="genInstanceChildCompDocs 1> thisInstanceContentId: ${thisInstanceContentId}" level="info"/>
<entity-condition entity-name="ContentAssoc" list-name="contentAssocList">
<condition-list combine="and" >
<condition-expr field-name="contentIdTo" operator="equals" env-name="thisTemplateContentId" />
@@ -102,6 +119,7 @@
</condition-list>
</condition-list>
</entity-condition>
+ <log message="genInstanceChildCompDocs 1> contentAssocList: ${contentAssocList}" level="info"/>
<iterate list-name="contentAssocList" entry-name="templateContentAssoc">
<clone-value value-name="templateContent" new-value-name="instanceContent"/>
Modified: trunk/applications/content/servicedef/services.xml
===================================================================
--- trunk/applications/content/servicedef/services.xml 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/servicedef/services.xml 2006-02-06 23:46:53 UTC (rev 6696)
@@ -1310,8 +1310,10 @@
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"/>
+ <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="contentRevisionSeqId" type="String" mode="OUT" optional="false"/>
</service>
<service name="persistCompDoc" engine="simple"
@@ -1320,7 +1322,6 @@
<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="INOUT" optional="true"/>
<attribute name="rootInstanceContentId" type="String" mode="INOUT" optional="true"/>
</service>
</services>
Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-02-06 23:46:53 UTC (rev 6696)
@@ -935,9 +935,9 @@
</request-map>
<!-- ================ CompDoc Requests ================= -->
- <request-map uri="FindCompDocRoot">
+ <request-map uri="FindCompDoc">
<security auth="true" https="true"/>
- <response name="success" type="view" value="FindCompDocRoot"/>
+ <response name="success" type="view" value="FindCompDoc"/>
</request-map>
<request-map uri="ListCompDoc">
<security auth="true" https="true"/>
@@ -988,6 +988,10 @@
<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"/>
@@ -1053,8 +1057,8 @@
<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"/>
+ <response name="success" type="view" value="EditCompDoc"/>
+ <response name="error" type="view" value="AddRootCompDocInstance"/>
</request-map>
<!-- ================ CompDoc ContentRole Requests ================= -->
@@ -1699,7 +1703,7 @@
<view-map name="ListContentApproval" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentApproval" type="screen"/>
<view-map name="EditContentApproval" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentApproval" type="screen"/>
- <view-map name="FindCompDocRoot" page="component://content/widget/compdoc/CompDocScreens.xml#FindCompDocRoot" type="screen"/>
+ <view-map name="FindCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#FindCompDoc" type="screen"/>
<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"/>
@@ -1723,6 +1727,7 @@
<view-map name="EditCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDoc" type="screen"/>
<view-map name="EditRootCompDocContent" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDocContent" type="screen"/>
<view-map name="EditCompDocContentRole" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocContentRole" type="screen"/>
+ <view-map name="ViewInstances" page="component://content/widget/compdoc/CompDocScreens.xml#ViewInstances" type="screen"/>
<view-map name="ViewSimpleContent" page="" type="simplecontent"/>
<!-- end of view mappings -->
Modified: trunk/applications/content/webapp/content/includes/header.ftl
===================================================================
--- trunk/applications/content/webapp/content/includes/header.ftl 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/webapp/content/includes/header.ftl 2006-02-06 23:46:53 UTC (rev 6696)
@@ -47,7 +47,7 @@
<#assign cmsTarget=menuContext.cms.cmsRequestName/>
</#if>
<div class="col"><a href="<@ofbizUrl>${cmsTarget}</@ofbizUrl>" class="${selectedLeftClassMap.CMS?default(unselectedLeftClassName)}">CMS</a></div>
- <div class="col"><a href="<@ofbizUrl>FindCompDocRoot</@ofbizUrl>" class="${selectedLeftClassMap.CompDoc?default(unselectedLeftClassName)}">CompDoc</a></div>
+ <div class="col"><a href="<@ofbizUrl>FindCompDoc</@ofbizUrl>" class="${selectedLeftClassMap.CompDoc?default(unselectedLeftClassName)}">CompDoc</a></div>
<#if requestAttributes.userLogin?has_content>
<div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.login?default(unselectedRightClassName)}">Logout</a></div>
Modified: trunk/applications/content/widget/CommonScreens.xml
===================================================================
--- trunk/applications/content/widget/CommonScreens.xml 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/widget/CommonScreens.xml 2006-02-06 23:46:53 UTC (rev 6696)
@@ -114,6 +114,13 @@
<set from-field="rootInstanceRevSeqId" default-value="${parameters.rootInstanceRevSeqId}" field="rootInstanceRevSeqId" global="true" />
<set from-field="contentId" default-value="${parameters.contentId}" field="contentId" global="true" />
<set from-field="contentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="contentRevisionSeqId" global="true" />
+
+ <set from-field="rootTemplateContentId" field="dummy.rootTemplateContentId" />
+ <set from-field="rootInstanceContentId" field="dummy.rootInstanceContentId" />
+ <set from-field="rootTemplateRevSeqId" field="dummy.rootTemplateRevSeqId" />
+ <set from-field="rootInstanceRevSeqId" field="dummy.rootInstanceRevSeqId" />
+ <set from-field="contentId" field="dummy.contentId" />
+ <set from-field="contentRevisionSeqId" field="dummy.contentRevisionSeqId" />
</actions>
<widgets>
<decorator-screen name="mainContentDecorator" >
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-06 23:46:53 UTC (rev 6696)
@@ -23,19 +23,22 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+
+ <!-- dummy values -->
+ <form name="dummy" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <field name="rootTemplateContentId" map-name="dummy"><hidden/></field>
+ <field name="rootInstanceContentId" map-name="dummy"><hidden/></field>
+ <field name="rootTemplateRevSeqId" map-name="dummy"><hidden/></field>
+ <field name="rootInstanceRevSeqId" map-name="dummy"><hidden/></field>
+ <field name="contentId" map-name="dummy"><hidden/></field>
+ <field name="contentRevisionSeqId" map-name="dummy"><hidden/></field>
+ </form>
<!-- CompDoc forms -->
- <form name="FindCompDocTemplate" default-title-style="tableheadtext"
- default-tooltip-style="tabletext" default-widget-style="inputBox"
- default-entity-name="Content"
- target="ListCompDocTemplate" title=" " type="single" >
- <field name="contentName" title="Name" ><text-find/></field>
- <field name="contentId" title="Content Id" ><text-find/></field>
- <field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
<form name="FindCompDoc" default-title-style="tableheadtext"
default-tooltip-style="tabletext" default-widget-style="inputBox"
default-entity-name="Content"
+ extends="dummy"
target="ListCompDoc" title=" " type="single" >
<field name="contentName" title="Name" ><text/></field>
<field name="contentId" title="Content Id" ><text/></field>
@@ -60,10 +63,10 @@
<field name="contentTypeId" title="Content Type Id" ><display/></field>
<field name="contentName" title="Name" ><display/></field>
<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}"/>
+ <hyperlink also-hidden="false" description="Edit" target="EditCompDoc?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}"/>
+ <hyperlink also-hidden="false" description="Edit" target="EditCompDoc?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}"/>
@@ -333,46 +336,51 @@
</form>
<form name="AddRootCompDocInstance" default-map-name="" title="" type="single" target="genCompDocInstance"
+ extends="dummy"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <field name="contentId"><text/></field>
+ <field name="contentId" entry-name="empty"><text/></field>
<field name="contentName"><text/></field>
- <field name="rootTemplateContentId" entry-name="instanceOfContentId" map-name="parameters"><hidden/></field>
+ <field name="instanceOfContentId" entry-name="rootTemplateContentId" map-name="parameters"><display/></field>
+ <field name="contentTypeId" ><display/></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="EditRootCompDocInstance" default-map-name="content" title="" type="single" target="updateRootCompDocTemplate"
+ extends="dummy"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <field name="contentId"><text/></field>
+ <field name="contentId"><display/></field>
<field name="contentName"><text/></field>
- <field name="contentTypeId" ><hidden value="COMPDOC_TEMPLATE"/></field>
+ <field name="instanceOfContentId"><display/></field>
+ <field name="contentTypeId" ><display/></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"
+ extends="dummy"
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="contentTypeId" map-name="dummy" ><display/></field>
<field name="rootTemplateContentId"><hidden /></field>
<field name="rootTemplateRevSeqId"><hidden /></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="EditRootCompDocTemplate" default-map-name="content" title="" type="single" target="updateRootCompDocTemplate"
+ extends="dummy"
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="rootTemplateContentId"><hidden /></field>
- <field name="rootTemplateRevSeqId"><hidden /></field>
+ <field name="contentTypeId" map-name="dummy" ><display/></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"
+ extends="dummy"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="contentId"><text/></field>
@@ -383,12 +391,11 @@
<field name="fromDate" ><display/></field>
<field name="thruDate" ><date-time/></field>
<field name="sequenceNum" ><text/></field>
- <field name="rootTemplateContentId"><hidden /></field>
- <field name="rootTemplateRevSeqId"><hidden /></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="EditChildCompDocTemplate" default-map-name="contentAssocView" title="" type="single" target="updateChildCompDocTemplate"
+ extends="dummy"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="contentId"><text/></field>
@@ -399,8 +406,6 @@
<field name="caFromDate" title="From Date" ><display/></field>
<field name="caThruDate" title="Thru Date" ><date-time/></field>
<field name="caSequenceNum" title="Sequence Num" ><text/></field>
- <field name="rootTemplateContentId"><hidden /></field>
- <field name="rootTemplateRevSeqId"><hidden /></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified: trunk/applications/content/widget/compdoc/CompDocMenus.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-02-06 23:46:53 UTC (rev 6696)
@@ -62,13 +62,16 @@
default-tooltip-style="tabletext" default-widget-style="tabButton"
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
+ <menu-item name="find" title="Find" >
+ <link target="FindCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}"/>
+ </menu-item>
<menu-item name="viewtree" title="View Tree">
<condition>
<if-empty field-name="rootInstanceContentId"/>
</condition>
<link target="ViewCompDocTemplateTree?rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootTemplateContentId=${rootTemplateContentId}"/>
</menu-item>
- <menu-item name="viewtree" title="View Tree">
+ <menu-item name="viewtree2" title="View Tree">
<condition>
<not><if-empty field-name="rootInstanceContentId"/></not>
</condition>
@@ -80,7 +83,7 @@
<menu-item name="approval" title="Approvals" >
<link target="ListContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}"/>
</menu-item>
- <menu-item name="revision" title="Template Revisions" >
+ <menu-item name="revision" title="Revisions" >
<link target="ListContentRevisions?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}"/>
</menu-item>
@@ -128,8 +131,11 @@
<menu-item name="child" title="+Child" >
<link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999&rootTemplateContentId=${rootTemplateContentId}"/>
</menu-item>
+ <menu-item name="viewinst" title="View Instances" >
+ <link target="ViewInstances?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}"/>
+ </menu-item>
<menu-item name="addinst" title="Add Instance" >
- <link target="AddCompDocInstance?instanceOfContentId=${contentId}"/>
+ <link target="AddRootCompDocInstance?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}"/>
</menu-item>
</menu>
@@ -168,14 +174,11 @@
default-tooltip-style="tabletext" default-widget-style="tabButton"
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
- <menu-item name="edit-inplace" title="${contentName}[${contentId}]" >
- <link target="EditRootCompDoc?contentId=${rootInstanceContentId}&instanceOfContentId=${contentId}&currentContentTypeId=COMPDOC_INSTANCE"/>
+ <menu-item name="edit-inplace" title="${contentName}[${rootInstanceContentId}]" >
+ <link target="EditRootComp?contentId=${rootInstanceContentId}&instanceOfContentId=${contentId}&currentContentTypeId=COMPDOC_INSTANCE"/>
</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 name="viewtree" title="View Template Tree">
+ <link target="ViewCompDocTemplateTree?rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootTemplateContentId=${contentId}"/>
</menu-item>
</menu>
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-06 22:35:58 UTC (rev 6695)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-06 23:46:53 UTC (rev 6696)
@@ -174,7 +174,7 @@
</section>
</screen>
- <screen name="FindCompDocRoot">
+ <screen name="FindCompDoc">
<section>
<condition>
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
@@ -194,7 +194,7 @@
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
<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"/>
+ <link target="AddRootCompDocTemplate?contentTypeId=COMPDOC_TEMPLATE" text="Create New Root CompDoc Template" style="buttontext"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -214,31 +214,53 @@
<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"/>
+ <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>
<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>
+ <include-form name="ListCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ <link target="FindCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Find" style="buttontext"/>
+ <link target="AddRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Root CompDoc Template" style="buttontext"/>
</decorator-section>
</decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ViewInstances">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ </condition>
+ <actions>
+ <set field="menuName" value="empty"/>
+ <set field="title" value="View CompDoc Instances of ${parameters.rootTemplateContentId}"/>
+ <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"/>
+ <entity-and entity-name="Content" list-name="compDocFindList">
+ <field-map field-name="instanceOfContentId" env-name="parameters.rootTemplateContentId"/>
+ <field-map field-name="contentTypeId" value="COMPDOC_INSTANCE"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <include-form name="ListCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ <link target="FindCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Find" style="buttontext"/>
+ <link target="AddRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Root CompDoc Template" style="buttontext"/>
+ </decorator-section>
+ </decorator-screen>
</widgets>
</section>
</screen>
@@ -252,7 +274,10 @@
<actions>
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="edit"/>
- <entity-one entity-name="Content" value-name="content"/>
+
+ <set from-field="parameters.contentId" default-value="${parameters.rootInstanceContentId}" field="contentId"/>
+ <set from-field="contentId" default-value="${parameters.rootTemplateContentId}" field="contentId"/>
+ <entity-one entity-name="Content" value-name="content"/>
<entity-condition entity-name="ContentAssoc" list-name="contentAssocList">
<condition-list>
<condition-expr field-name="contentId" operator="equals" env-name="content.contentId"/>
@@ -264,53 +289,73 @@
</condition-list>
</condition-list>
</entity-condition>
+ <set from-field="content.contentTypeId" field="dummy.contentTypeId"/>
</actions>
<widgets>
- <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
- <decorator-section name="body">
- <section>
- <condition>
- <and>
- <if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
- </and>
- </condition>
- <widgets>
+ <section>
+ <condition>
+ <and>
+ <if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
+ </and>
+ </condition>
+ <actions>
+ <set from-field="content.contentId" field="rootTemplateContentId"/>
+ </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"/>
- </widgets>
- </section>
- <section>
- <condition>
- <and>
- <if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
- </and>
- </condition>
- <widgets>
+ <link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Root CompDoc Instance" style="buttontext"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <and>
+ <if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
+ </and>
+ </condition>
+ <actions>
+ <set from-field="content.contentId" field="rootInstanceContentId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="body">
<include-form name="EditRootCompDocInstance" location="component://content/widget/compdoc/CompDocForms.xml"/>
- </widgets>
- </section>
- <section>
- <condition>
- <and>
- <if-compare field-name="content.contentTypeId" operator="equals" value="TEMPLATE"/>
- </and>
- </condition>
- <widgets>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <and>
+ <if-compare field-name="content.contentTypeId" operator="equals" value="TEMPLATE"/>
+ </and>
+ </condition>
+ <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"/>
- </widgets>
- </section>
- <section>
- <condition>
- <and>
- <if-compare field-name="content.contentTypeId" operator="equals" value="DOCUMENT"/>
- </and>
- </condition>
- <widgets>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <and>
+ <if-compare field-name="content.contentTypeId" operator="equals" value="DOCUMENT"/>
+ </and>
+ </condition>
+ <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"/>
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</widgets>
</section>
</screen>
@@ -324,7 +369,8 @@
<actions>
<set field="menuName" value="tree"/>
<set field="title" value="Composite Document Instance Add Page"/>
- <set from-field="parameters.instanceOfContentId" field="rootTemplateContentId" />
+ <set value="COMPDOC_INSTANCE" field="contentTypeId" />
+ <set value="" field="dummy2.contentId" />
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -344,6 +390,7 @@
<actions>
<set field="menuName" value="tree"/>
<set field="title" value="Composite Document Instance Add Page"/>
+ <set value="COMPDOC_TEMPLATE" field="dummy.contentTypeId"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -475,7 +522,7 @@
<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="title" value="Composite Document Root Template View Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
<set field="currentMenuItemName" value="viewtree"/>
<entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
@@ -508,12 +555,11 @@
<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="viewtree"/>
+ <set field="currentMenuItemName" value="viewtree2"/>
<entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
<condition-list combine="and">
- <condition-expr field-name="contentId" env-name="rootInstanceContentId" operator="equals"/>
+ <condition-expr field-name="contentId" env-name="parameters.rootInstanceContentId" 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"/>
@@ -521,10 +567,12 @@
<set field="rootInstanceRevSeqId" from-field="parameters.rootInstanceRevSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}"/>
<entity-one entity-name="Content" value-name="content" use-cache="true">
- <field-map field-name="contentId" env-name="rootInstanceContentId"/>
+ <field-map field-name="contentId" env-name="parameters.rootInstanceContentId"/>
</entity-one>
<set field="rootTemplateContentId" from-field="content.instanceOfContentId"/>
- <set field="currentContentTypeId" value="COMPDOC_INSTANCE" to-scope="user"/>
+ <set field="contentRevisionSeqId" from-field="parameters.rootInstanceRevSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}"/>
+ <set field="contentId" from-field="parameters.rootTemplateContentId" />
+ <set field="title" value="Composite Document Root Instance View Page for Id: ${parameters.rootInstanceContentId} instance of ${rootTemplateContentId}"/>
</actions>
<widgets>
@@ -644,32 +692,6 @@
</screen>
- <screen name="EditCompDocContent">
- <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="find" />
- <set field="contentIdTo" from-field="parameters.caContentIdTo"/>
- <set field="rootEntityId" from-field="parameters.caContentIdTo" />
- <set field="ownerContentId" from-field="parameters.ownerContentId" />
- <set field="sequenceNum" from-field="parameters.caSequenceNum" />
- </actions>
- <widgets>
- <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
- <decorator-section name="body">
- <include-form name="EditCompDocContent" location="component://content/widget/compdoc/CompDocForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<!-- ================ CompDoc Requests ================= -->
<screen name="EditContentRevisionAndItem">
More information about the Svn
mailing list