[OFBiz] SVN: r6670 - in trunk/applications/content: script/org/ofbiz/content/compdoc widget/compdoc
byersa@svn.ofbiz.org
byersa at svn.ofbiz.org
Thu Feb 2 17:27:49 CST 2006
Author: byersa
Date: 2006-02-02 17:27:43 -0600 (Thu, 02 Feb 2006)
New Revision: 6670
Modified:
trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.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:
Improvement on CompDoc navigation.
Generating ContentRevision/Items, but not fully using them.
That's next.
Modified: trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
===================================================================
--- trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-02-02 22:37:05 UTC (rev 6669)
+++ trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-02-02 23:27:43 UTC (rev 6670)
@@ -126,6 +126,7 @@
<simple-method method-name="persistCompDoc" 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">
@@ -135,6 +136,7 @@
<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"/>
@@ -148,6 +150,12 @@
<field-to-result field-name="pResults.${key}" result-name="${key}"/>
</iterate-map>
<log level="info" message="pResults : ${pResults}"/>
+ <if-not-empty field-name="pResults.contentIdTo">
+ <set from-field="pResults.contentIdTo" field="resequenceMap.contentIdTo"/>
+ <set value="COMPDOC_PART" field="resequenceMap.typeList[]"/>
+ <set value="10" field="resequenceMap.seqInc" type="Integer"/>
+ <call-service service-name="resequence" in-map-name="resequenceMap"/>
+ </if-not-empty>
<if>
<condition>
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-02 22:37:05 UTC (rev 6669)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-02 23:27:43 UTC (rev 6670)
@@ -345,6 +345,15 @@
<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"
+ 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="AddRootCompDocTemplate" default-map-name="" title="" type="single" target="createRootCompDocTemplate"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
@@ -354,7 +363,7 @@
<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"
+ <form name="EditRootCompDocTemplate" default-map-name="content" title="" type="single" target="updateRootCompDocTemplate"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="contentId"><text/></field>
@@ -389,7 +398,7 @@
<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="rootTemplateContentId" entry-name="rootTemplateContentId" map-name="parameters"><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-02 22:37:05 UTC (rev 6669)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-02-02 23:27:43 UTC (rev 6670)
@@ -145,10 +145,10 @@
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
<menu-item name="edit-inplace" title="${contentName}[${contentId}]" >
- <link target="EditRootCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-link" title="Edit" >
- <link target="EditRootCompDoc?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}"/>
</menu-item>
<menu-item name="child" title="+Child" >
<link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999&rootTemplateContentId=${rootTemplateContentId}"/>
@@ -167,23 +167,22 @@
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
<menu-item name="edit-inplace" title="${contentName}[${contentId}]" >
- <link target="EditChildCompDoc?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditChildCompDocTemplate?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}"/>
</menu-item>
<menu-item name="edit-link" title="Edit" >
- <link target="EditChildCompDoc?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}"/>
+ <link target="EditChildCompDocTemplate?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}"/>
</menu-item>
+ <!-- only one level for now
<menu-item name="child" title="+Child" >
<link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999&rootTemplateContentId=${rootTemplateContentId}"/>
</menu-item>
- <menu-item name="child" title="+Bef" >
- <link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999&rootTemplateContentId=${rootTemplateContentId}"/>
+ -->
+ <menu-item name="bef" title="+Bef" >
+ <link target="AddChildCompDocTemplate?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}"/>
</menu-item>
- <menu-item name="child" title="+Aft" >
- <link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999&rootTemplateContentId=${rootTemplateContentId}"/>
+ <menu-item name="aft" title="+Aft" >
+ <link target="AddChildCompDocTemplate?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumAfter}&caFromDate=${fromDate}&contentRevisionSeqId=${contentRevisionSeqId}"/>
</menu-item>
- <menu-item name="addinst" title="Add Instance" >
- <link target="AddCompDocInstance?instanceOfContentId=${contentId}"/>
- </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 22:37:05 UTC (rev 6669)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-02 23:27:43 UTC (rev 6670)
@@ -733,7 +733,7 @@
<actions>
<set field="menuName" value="treecdt"/>
<set field="title" value="Composite Document Template Edit Page"/>
- <set from-field="parameters.contentIdTo" field="rootTemplateContentId" />
+ <set from-field="parameters.rootTemplateContentId" default-value="${parameters.caContentIdTo}" field="rootTemplateContentId" />
<set value="" field="rootInstanceContentId" />
<!--
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
@@ -741,10 +741,10 @@
<entity-one entity-name="ContentAssocViewFrom" value-name="contentAssocView" use-cache="true">
<field-map field-name="contentId" env-name="parameters.contentId"/>
<field-map field-name="caContentId" env-name="parameters.contentId"/>
- <field-map field-name="caContentIdTo" env-name="parameters.contentIdTo"/>
+ <field-map field-name="caContentIdTo" env-name="parameters.caContentIdTo"/>
<field-map field-name="caContentAssocTypeId" env-name="parameters.caContentAssocTypeId"/>
<field-map field-name="caFromDate" env-name="parameters.caFromDate"/>
- <field-map field-name="contentIdStart" env-name="parameters.contentIdTo"/>
+ <field-map field-name="contentIdStart" env-name="parameters.caContentIdTo"/>
</entity-one>
</actions>
<widgets>
@@ -800,7 +800,7 @@
<actions>
<script location="component://content/widget/getMenuContext.bsh"/>
- <set field="menuName" value="tree"/>
+ <set field="menuName" value="treecdt"/>
<set field="title" value="Composite Document Root Template Edit Page"/>
<set field="titleProperty" value="PageTitleEditContent"/>
<set field="currentMenuItemName" value="viewtree"/>
@@ -928,18 +928,6 @@
</actions>
<widgets>
<include-menu name="childTemplateLine" location="component://content/widget/compdoc/CompDocMenus.xml"/>
- <container style="responseSelected">
- <link text="${contentName}[${contentId}]" target="EditCompDocContent?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}" style="responseheader" />
- <link text="Edit" target="EditCompDocContent?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}" style="tabButton" />
- <link text="Approval" target="ListApprovalTemplateAndHistory?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}" style="tabButton" />
- <link text="+Child" target="AddCompDocTemplate?caContentIdTo=${contentId}&caSequenceNum=9999&rootTemplateContentId=${rootTemplateContentId}" style="tabButton" target-window="_top" />
- <link text="+Bef" target="EditCompDocTemplate?caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${caFromDate}&rootTemplateContentId=${rootTemplateContentId}" style="tabButton" target-window="_top" />
- <link text="+Aft" target="EditCompDocTemplate?caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caSequenceNum=${seqNumAfter}&caFromDate=${caFromDate}&rootTemplateContentId=${rootTemplateContentId}" style="tabButton" target-window="_top" />
- <link text="Instance" target="EditCompDocInstance?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}" style="tabButton" />
- <container style="responsetext">
- <label text="${description}" style="responsetext" />
- </container>
- </container>
</widgets>
</section>
</screen>
Modified: trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-02-02 22:37:05 UTC (rev 6669)
+++ trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-02-02 23:27:43 UTC (rev 6670)
@@ -28,6 +28,8 @@
<select-field field-name="contentAssocTypeId"/>
<select-field field-name="fromDate"/>
<select-field field-name="sequenceNum"/>
+
+ <order-by field-name="-sequenceNum"/>
</entity-condition>
</sub-node>
@@ -56,6 +58,8 @@
<select-field field-name="contentAssocTypeId"/>
<select-field field-name="fromDate"/>
<select-field field-name="sequenceNum"/>
+
+ <order-by field-name="-sequenceNum"/>
</entity-condition>
</sub-node>
</node>
@@ -89,6 +93,7 @@
<select-field field-name="fromDate"/>
<select-field field-name="sequenceNum"/>
+ <order-by field-name="-sequenceNum"/>
</entity-condition>
</sub-node>
</node>
@@ -116,6 +121,8 @@
<select-field field-name="contentAssocTypeId"/>
<select-field field-name="fromDate"/>
<select-field field-name="sequenceNum"/>
+
+ <order-by field-name="-sequenceNum"/>
</entity-condition>
</sub-node>
</node>
More information about the Svn
mailing list