[OFBiz] SVN: r7075 - trunk/applications/content/widget/compdoc
jonesde@svn.ofbiz.org
jonesde at svn.ofbiz.org
Fri Mar 24 21:31:03 CST 2006
Author: jonesde
Date: 2006-03-24 21:30:59 -0600 (Fri, 24 Mar 2006)
New Revision: 7075
Modified:
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:
More CompDoc cleanups and fixes; some more field and parameter name simplification and cleanup, fixed some missing fields in certain cases like the Survey Response ID lookup, also shows instance revision status on revision page (was just on the tree page)
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-03-25 00:04:33 UTC (rev 7074)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-03-25 03:30:59 UTC (rev 7075)
@@ -51,16 +51,16 @@
<field name="contentTypeId" title="Content Type Id"><display/></field>
<field name="contentName" title="Name"><display/></field>
<field name="edit" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
+ <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}&rootContentId=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
</field>
<field name="edit" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
+ <hyperlink also-hidden="false" description="Edit" target="EditRootCompDoc?contentId=${contentId}&rootContentId=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
</field>
<field name="edit" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Edit" target="EditChildCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
+ <hyperlink also-hidden="false" description="Edit" target="EditChildCompDoc?contentId=${contentId}&rootContentId=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
</field>
<field name="edit" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="buttontext">
- <hyperlink also-hidden="false" description="Edit" target="EditChildCompDoc?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
+ <hyperlink also-hidden="false" description="Edit" target="EditChildCompDoc?contentId=${contentId}&rootContentId=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
</field>
<field name="tree" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="Tree" target="ViewCompDocTemplateTree?rootContentId=${contentId}"/>
@@ -75,7 +75,7 @@
target="" paginate-target="ListCompDocInstances">
<field name="contentId" title="Content Id"><display/></field>
<field name="contentName" title="Name"><display/></field>
- <field name="caContentIdTo" title="Content Id To"><display/></field>
+ <field name="rootContentId" 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>
@@ -309,11 +309,12 @@
<form name="AddChildCompDoc" default-map-name="" type="single" target="${childCompDocTarget}"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <field name="rootContentId"><hidden/></field>
<field name="contentId"><ignored/></field>
<field name="contentName"><text/></field>
<field name="contentTypeId"><hidden/></field>
<field name="instanceOfContentId" use-when=""DOCUMENT".equals(contentTypeId)" title="Instance of Content" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
- <field name="caContentIdTo" map-name="parameters" widget-style="tabletext" title="Parent Content ID">
+ <field name="caContentIdTo" entry-name="rootContentId" map-name="parameters" widget-style="tabletext" title="Parent Content ID">
<display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/>
</field>
<field name="contentAssocTypeId" widget-style="tabletext"><display-entity entity-name="ContentAssocType"/></field>
@@ -324,13 +325,13 @@
<field name="mimeTypeId" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)">
<hidden value="application/vnd.ofbiz.survey.response"/>
</field>
- <field name="displayMimeTypeId" map-name="empty" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)">
+ <field name="displayMimeTypeId" map-name="empty" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext">
<display description="Survey Response"/>
</field>
- <field name="mimeTypeId" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && !"SURVEY".equals(templateDataResourceTypeId)">
+ <field name="mimeTypeId" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && !"SURVEY".equals(templateDataResourceTypeId)" widget-style="tabletext">
<display-entity entity-name="MimeType" description="${description}"/>
</field>
- <field name="mimeTypeId" title="Document Type" use-when=""TEMPLATE".equals(contentTypeId)">
+ <field name="mimeTypeId" title="Document Type" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="smallSelect">
<drop-down allow-empty="false">
<option key="application/msword" description="MS Word"/>
<option key="application/pdf" description="PDF File"/>
@@ -388,16 +389,23 @@
<field name="relatedDetailId" map-name="dataResource" title="Survey ID"
use-when="dataResource!=null && "SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
<lookup target-form-name="LookupSurvey">
- <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="buttontext" use-when="dataResource.get("relatedDetailId")!=null"/>
+ <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="buttontext"
+ use-when="dataResource.get("relatedDetailId")!=null"/>
</lookup>
</field>
<field name="relatedDetailId" map-name="dataResource" title="Survey Response ID"
- use-when="dataResource!=null && "SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId")) && dataResource.get("relatedDetailId")!=null">
+ use-when="dataResource!=null && "SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))">
<lookup target-form-name="LookupSurveyResponse">
<sub-hyperlink target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}"
- description="Edit Survey Response" link-style="buttontext" use-when="dataResource.get("relatedDetailId")!=null"/>
+ description="Edit Survey Response" link-style="buttontext" use-when="dataResource!=null && dataResource.get("relatedDetailId")!=null"/>
</lookup>
</field>
+
+ <field name="objectInfo" title="Current File Name" map-name="dataResource" widget-style="tabletext"
+ use-when=""DOCUMENT".equals(contentTypeId) && mimeTypeId!=null && !"application/vnd.ofbiz.survey".equals(mimeTypeId)">
+ <display also-hidden="false"/>
+ </field>
+
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -473,8 +481,8 @@
<field name="dataResourceId" map-name="dataResource"><hidden/></field>
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
<field name="mimeTypeId" map-name="dataResource"><hidden/></field>
- <field name="objectInfo" title="File Name" map-name="dataResource"><display also-hidden="false"/></field>
- <field name="imageData" title="Browse"><file/></field>
+ <!-- would show previous file name... doesn't make too much sense <field name="objectInfo" title="File Name" map-name="dataResource"><display also-hidden="false"/></field> -->
+ <field name="imageData" title="File"><file/></field>
<field name="rootContentId"><hidden/></field>
<field name="submitButton" title="Upload" widget-style="smallSubmit"><submit/></field>
</form>
Modified: trunk/applications/content/widget/compdoc/CompDocMenus.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-03-25 00:04:33 UTC (rev 7074)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-03-25 03:30:59 UTC (rev 7075)
@@ -108,7 +108,7 @@
<condition>
<if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
</condition>
- <link target="AddChildCompDocTemplate?caContentIdTo=${contentId}&sequenceNum=9999"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}& -->
+ <link target="AddChildCompDocTemplate?rootContentId=${contentId}&sequenceNum=9999"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}& -->
</menu-item>
<menu-item name="latest" title="Current Template CompDoc">
<condition>
@@ -135,7 +135,7 @@
<menu-item name="edit-link" title="Edit">
<link target="EditChildCompDoc?contentId=${contentId}&rootContentId=${rootContentId}&caFromDate=${fromDate}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
- <!-- only one level for now
+ <!-- only one level for now, ie don't worry about an hierarchy, still not sure what that will mean or look like
<menu-item name="child" title="+Child">
<link target="AddChildCompDocTemplate?contentIdTo=${contentId}&sequenceNum=9999"/>
</menu-item>
@@ -144,13 +144,13 @@
<condition>
<if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
</condition>
- <link target="AddChildCompDocTemplate?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}"/> <!-- &contentRevisionSeqId=${contentRevisionSeqId} -->
+ <link target="AddChildCompDocTemplate?contentId=${contentId}&rootContentId=${rootContentId}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${fromDate}"/> <!-- &contentRevisionSeqId=${contentRevisionSeqId} -->
</menu-item>
<menu-item name="aft" title="+Aft">
<condition>
<if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
</condition>
- <link target="AddChildCompDocTemplate?contentId=${contentId}&caContentIdTo=${contentIdTo}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumAfter}&caFromDate=${fromDate}"/> <!-- &contentRevisionSeqId=${contentRevisionSeqId} -->
+ <link target="AddChildCompDocTemplate?contentId=${contentId}&rootContentId=${rootContentId}&caContentAssocTypeId=${contentAssocTypeId}&caSequenceNum=${seqNumAfter}&caFromDate=${fromDate}"/> <!-- &contentRevisionSeqId=${contentRevisionSeqId} -->
</menu-item>
<menu-item name="up" title="^Up">
<condition>
@@ -173,20 +173,20 @@
<condition>
<not><if-empty field-name="assocRevisionItemView"/></not>
</condition>
- <link target="EditCompDoc?contentId=${assocRevisionItemView.contentId}&caContentIdTo=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+ <link target="EditCompDoc?contentId=${assocRevisionItemView.contentId}&rootContentId=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-link" title="Edit">
<condition>
<not><if-empty field-name="assocRevisionItemView"/></not>
</condition>
- <link target="EditChildCompDoc?contentId=${assocRevisionItemView.contentId}&caContentIdTo=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+ <link target="EditChildCompDoc?contentId=${assocRevisionItemView.contentId}&rootContentId=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-inplace-add" title="${contentName}[${assocRevisionItemView.itemContentId}]">
<condition>
<if-empty field-name="assocRevisionItemView"/>
</condition>
- <link target="AddChildCompDocInstance?caContentIdTo=${rootContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
+ <link target="AddChildCompDocInstance?rootContentId=${rootContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-link-add" title="Add">
<condition>
@@ -195,7 +195,7 @@
<if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
</and>
</condition>
- <link target="AddChildCompDocInstance?caContentIdTo=${rootContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
+ <link target="AddChildCompDocInstance?rootContentId=${rootContentId}&instanceOfContentId=${contentId}&caSequenceNum=${maxRevisionSeqId}"/>
</menu-item>
<menu-item name="pdf" title="View as PDF">
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-03-25 00:04:33 UTC (rev 7074)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-03-25 03:30:59 UTC (rev 7075)
@@ -23,10 +23,16 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/>
- <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="contentRevisionSeqId"/>
+ <set field="rootContentId" from-field="parameters.rootContentId" default-value="${parameters.contentId}"/>
+ <set field="rootContentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}"/>
+ <set field="contentId" from-field="parameters.rootContentId" default-value="${parameters.contentId}"/>
+ <set field="contentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}"/>
+
+ <service service-name="getMostRecentRevision" result-map-name="revisionResult">
+ <field-map field-name="contentId" env-name="rootContentId"/>
+ </service>
+ <set field="mostRecentRevisionSeqId" from-field="revisionResult.mostRecentRevisionSeqId"/>
+
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="approval"/>
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
@@ -44,6 +50,10 @@
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
<container><link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="View Waiting Approvals" style="buttontext"/></container>
+ <section>
+ <condition><if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/></condition>
+ <widgets><include-screen name="rootInstanceApprovalStatus"/></widgets>
+ </section>
<include-form name="ListContentApproval" location="component://content/widget/compdoc/CompDocForms.xml"/>
<section>
<condition>
@@ -69,11 +79,12 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/>
- <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="contentRevisionSeqId"/>
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/>
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="contentRevisionSeqId"/>
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
+
<set from-field="content.contentTypeId" field="contentTypeId"/>
<set field="menuName" value="empty"/>
<set field="currentMenuItemName" value="approval"/>
@@ -129,21 +140,20 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
- <set from-field="rootContentId" field="contentId"/>
- <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId"/>
+ <set from-field="parameters.rootContentId" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
+ <set from-field="rootContentId" field="contentId"/>
+ <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId"/>
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
<set from-field="content.contentTypeId" field="contentTypeId"/>
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="revision"/>
-
<entity-one entity-name="Content" value-name="content" use-cache="true">
<field-map field-name="contentId" env-name="contentId"/>
</entity-one>
<set from-field="content.contentTypeId" field="contentTypeId"/>
- <entity-and entity-name="ContentRevision" list-name="contentRevisionList" use-cache="true">
+ <entity-and entity-name="ContentRevision" list-name="contentRevisionList" use-cache="true">
<field-map env-name="contentId" field-name="contentId"/>
</entity-and>
@@ -164,18 +174,17 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/>
- <set from-field="parameters.contentId" field="contentId"/>
- <set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId"/>
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/>
+ <set from-field="parameters.contentId" field="contentId"/>
+ <set from-field="parameters.contentRevisionSeqId" field="contentRevisionSeqId"/>
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
<set from-field="content.contentTypeId" field="contentTypeId"/>
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="revision"/>
<set field="title" value="Revision List Page for Content: ${rootContentId} rev. ${rootContentRevisionSeqId}"/>
- <entity-one entity-name="ContentRevision" value-name="contentRevision" use-cache="true">
- </entity-one>
+ <entity-one entity-name="ContentRevision" value-name="contentRevision" use-cache="true"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -192,10 +201,10 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
- <set from-field="rootContentId" field="contentId"/>
- <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId"/>
+ <set from-field="parameters.rootContentId" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
+ <set from-field="rootContentId" field="contentId"/>
+ <set from-field="rootContentRevisionSeqId" field="contentRevisionSeqId"/>
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
<set from-field="content.contentTypeId" field="contentTypeId"/>
<set field="menuName" value="tree"/>
@@ -222,10 +231,10 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
- <set from-field="parameters.contentId" default-value="${rootContentId}" field="contentId"/>
- <set from-field="parameters.contentRevisionSeqId" default-value="${rootContentRevisionSeqId}" field="contentRevisionSeqId"/>
+ <set from-field="parameters.rootContentId" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
+ <set from-field="parameters.contentId" default-value="${rootContentId}" field="contentId"/>
+ <set from-field="parameters.contentRevisionSeqId" default-value="${rootContentRevisionSeqId}" field="contentRevisionSeqId"/>
<entity-one entity-name="Content" value-name="content" use-cache="true"/>
<set from-field="content.contentTypeId" field="contentTypeId"/>
<set field="menuName" value="tree"/>
@@ -249,7 +258,6 @@
<if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<actions>
-
<set field="menuName" value="empty"/>
<set field="title" value="Find CompDoc"/>
<set field="entityName" value="ContentAssocViewFrom"/>
@@ -308,8 +316,8 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
+ <set from-field="parameters.rootContentId" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
<set field="menuName" value="tree"/>
<set field="entityName" value="ContentAssocViewFrom"/>
<set field="queryString" from-field="result.queryString"/>
@@ -485,9 +493,9 @@
<container>
<label style="tableheadtext" text="Viewing Revision [${rootContentRevisionSeqId}], Latest is [${mostRecentRevisionSeqId}]"/>
<link style="buttontext" text="Latest" target="EditChildCompDoc?contentId=${contentId}&rootContentId=${rootContentId}&caFromDate=${fromDate}"></link>
+ <include-screen name="ContentViewLink"/>
</container>
<include-form name="ViewChildCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
- <include-screen name="ContentViewLink"/>
</widgets>
</section>
</decorator-section>
@@ -527,23 +535,9 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="EditChildCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
- <section>
- <!--
- <condition>
- <and>
- <not><if-empty field-name="dataResource.dataResourceTypeId"/></not>
- <if-compare field-name="dataResource.dataResourceTypeId" operator="not-equals" value="SURVEY"/>
- </and>
- </condition>
- -->
- <actions>
- </actions>
- <widgets>
- <include-screen name="ContentViewLink"/>
- <include-screen name="UploadCompDocContent"/>
- </widgets>
- </section>
+ <include-screen name="ContentViewLink"/>
+ <include-form name="EditChildCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
+ <include-screen name="UploadCompDocContent"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -802,8 +796,8 @@
<actions>
<set field="menuName" value="tree"/>
<set field="title" value="Add Composite Document Template Page"/>
- <set value="COMPDOC_TEMPLATE" field="contentTypeId"/>
- <set value="createChildCompDocTemplate" field="createChildCompDoc"/>
+ <set field="contentTypeId" value="COMPDOC_TEMPLATE"/>
+ <set field="createChildCompDoc" value="createChildCompDocTemplate"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -822,20 +816,21 @@
<actions>
<set field="menuName" value="tree"/>
<set field="title" value="Add Composite Document Instance Part Page"/>
- <set field="contentIdTo" from-field="parameters.caContentIdTo"/>
+ <set field="contentIdTo" from-field="parameters.rootContentId"/>
<set field="templateContentId" from-field="parameters.instanceOfContentId"/>
<entity-one entity-name="Content" value-name="templateContent">
<field-map field-name="contentId" env-name="templateContentId"/>
</entity-one>
<set from-field="templateContent.contentName" field="contentName"/>
+
<get-related-one value-name="templateContent" relation-name="DataResource" to-value-name="templateDataResource"/>
<set field="templateDataResourceTypeId" from-field="templateDataResource.dataResourceTypeId"/>
<set field="mimeTypeId" from-field="templateDataResource.mimeTypeId"/>
- <set value="COMPDOC_PART" field="contentAssocTypeId"/>
- <set value="DOCUMENT" field="contentTypeId"/>
- <set from-field="parameters.caSequenceNum" field="sequenceNum" default-value="${parameters.sequenceNum}"/>
- <set value="createChildCompDocInstance" field="childCompDocTarget"/>
- <set from-field="parameters.contentId" field="contentId"/>
+ <set field="contentAssocTypeId" value="COMPDOC_PART"/>
+ <set field="contentTypeId" value="DOCUMENT"/>
+ <set field="sequenceNum" from-field="parameters.caSequenceNum" default-value="${parameters.sequenceNum}"/>
+ <set field="childCompDocTarget" value="createChildCompDocInstance"/>
+ <set field="contentId" from-field="parameters.contentId"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -854,7 +849,7 @@
<actions>
<set field="menuName" value="tree"/>
<set field="title" value="Add Composite Document Template Part Page"/>
- <set field="contentIdTo" from-field="parameters.caContentIdTo" default-value="${parameters.contentIdTo}"/>
+ <set field="contentIdTo" from-field="parameters.rootContentId" default-value="${parameters.contentIdTo}"/>
<set field="rootContentId" from-field="contentIdTo"/>
<set field="rootContentRevisionSeqId" from-field="parameters.rootContentRevisionSeqId"/>
<set field="contentAssocTypeId" value="COMPDOC_PART"/>
@@ -878,11 +873,10 @@
<condition>
<if-has-permission permission="CONTENTMGR" action="CREATE"/>
</condition>
-
<actions>
- <set from-field="parameters.rootContentId" field="rootContentId"/>
- <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
- <set value="COMPDOC_TEMPLATE" field="contentTypeId"/>
+ <set from-field="parameters.rootContentId" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId"/>
+ <set value="COMPDOC_TEMPLATE" field="contentTypeId"/>
<service service-name="getMostRecentRevision" result-map-name="revisionResult">
<field-map field-name="contentId" env-name="rootContentId"/>
</service>
@@ -892,7 +886,6 @@
<set field="menuName" value="tree"/>
<set field="title" value="Root Template ${rootContentId}, rev. ${rootContentRevisionSeqId}"/>
<set field="currentMenuItemName" value="viewtree"/>
-
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -958,32 +951,42 @@
</screen>
<screen name="rootInstanceLine">
<section>
+ <widgets>
+ <include-menu name="rootInstanceLine" location="component://content/widget/compdoc/CompDocMenus.xml"/>
+ <include-screen name="rootInstanceApprovalStatus"/>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="rootInstanceApprovalStatus">
+ <section>
<actions>
- <service service-name="getFinalApprovalStatus" result-map-name="results">
+ <service service-name="getFinalApprovalStatus" result-map-name="approvalStatusResult">
<field-map field-name="contentId" env-name="rootContentId"/>
<field-map field-name="contentRevisionSeqId" env-name="rootContentRevisionSeqId"/>
</service>
<entity-one entity-name="StatusItem" value-name="statusItem">
- <field-map field-name="statusId" env-name="results.approvalStatusId"/>
+ <field-map field-name="statusId" env-name="approvalStatusResult.approvalStatusId"/>
</entity-one>
</actions>
<widgets>
- <include-menu name="rootInstanceLine" location="component://content/widget/compdoc/CompDocMenus.xml"/>
- <label text="Approval Status: ${statusItem.description}" style="head2"/>
- <section>
- <condition>
- <and>
- <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
- <if-compare value="CNTAP_NOT_READY" field-name="results.approvalStatusId" operator="equals"/>
- </and>
- </condition>
- <widgets>
- <link text="Start Approval Process" target="prepForApproval?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" style="buttontext"/>
- </widgets>
- </section>
+ <container>
+ <label text="Approval Status: ${statusItem.description}" style="head2"/>
+ <section>
+ <condition>
+ <and>
+ <if-compare-field field-name="mostRecentRevisionSeqId" operator="equals" to-field-name="rootContentRevisionSeqId"/>
+ <if-compare field-name="approvalStatusResult.approvalStatusId" operator="equals" value="CNTAP_NOT_READY"/>
+ </and>
+ </condition>
+ <widgets>
+ <link text="Start Approval Process" target="prepForApproval?rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" style="buttontext"/>
+ </widgets>
+ </section>
+ </container>
</widgets>
</section>
</screen>
+
<screen name="childTemplateLine">
<section>
<actions>
@@ -1050,7 +1053,7 @@
</widgets>
</section>
</screen>
- <!-- ================ CompDoc Requests ================= -->
+
<screen name="EditContentRevisionAndItem">
<section>
<widgets>
Modified: trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-03-25 00:04:33 UTC (rev 7074)
+++ trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-03-25 03:30:59 UTC (rev 7075)
@@ -19,24 +19,23 @@
<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-tree.xsd">
<tree name="CompDocTemplateTree" root-node-name="node-root"
- default-render-style="simple" default-wrap-style="treeWrapper">
+ default-render-style="simple" default-wrap-style="treeWrapper">
<node name="node-root" wrap-style="treeWrapper">
- <entity-one entity-name="Content" use-cache="false">
+ <entity-one entity-name="Content" use-cache="false">
<field-map field-name="contentId" env-name="rootContentId"/>
</entity-one>
- <include-screen name="rootTemplateLine"
- location="component://content/widget/compdoc/CompDocScreens.xml" />
+ <include-screen name="rootTemplateLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
<sub-node node-name="node-body">
- <entity-condition entity-name="AssocRevisionItemView" use-cache="false" >
+ <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
<condition-list combine="and">
- <condition-expr field-name="contentIdTo" operator="equals" env-name="rootContentId" />
- <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId" />
+ <condition-expr field-name="contentIdTo" operator="equals" env-name="rootContentId"/>
+ <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId"/>
<condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" ignore-if-null="true"/>
- <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
+ <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
<condition-expr field-name="thruDate" operator="equals" value=""/>
- <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
</condition-list>
</condition-list>
@@ -50,27 +49,25 @@
<select-field field-name="sequenceNum"/>
<order-by field-name="sequenceNum"/>
-
</entity-condition>
</sub-node>
</node>
- <node name="node-body" join-field-name="itemContentId" entity-name="AssocRevisionItemView" wrap-style="treeWrapper">
- <entity-one entity-name="Content" use-cache="false">
+ <node name="node-body" join-field-name="itemContentId" entity-name="AssocRevisionItemView" wrap-style="treeWrapper">
+ <entity-one entity-name="Content" use-cache="false">
<field-map field-name="contentId" env-name="itemContentId"/>
</entity-one>
- <include-screen name="childTemplateLine"
- location="component://content/widget/compdoc/CompDocScreens.xml" />
+ <include-screen name="childTemplateLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
<sub-node node-name="node-body">
- <entity-condition entity-name="AssocRevisionItemView" use-cache="false" >
+ <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
<condition-list combine="and">
- <condition-expr field-name="contentIdTo" operator="equals" env-name="contentId" />
- <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId" />
- <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" ignore-if-null="true"/>
+ <condition-expr field-name="contentIdTo" operator="equals" env-name="contentId"/>
+ <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId"/>
+ <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" ignore-if-null="true"/>
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
<condition-expr field-name="thruDate" operator="equals" value=""/>
- <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
</condition-list>
</condition-list>
@@ -92,23 +89,21 @@
<tree name="CompDocInstanceTree" root-node-name="node-root"
default-render-style="simple" default-wrap-style="treeWrapper">
<node name="node-root">
- <entity-one entity-name="Content" use-cache="false">
+ <entity-one entity-name="Content" use-cache="false">
<field-map field-name="contentId" env-name="instanceContent.instanceOfContentId"/>
</entity-one>
- <include-screen name="rootInstanceLine"
- location="component://content/widget/compdoc/CompDocScreens.xml" />
+ <include-screen name="rootInstanceLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
<sub-node node-name="node-body">
-
- <entity-condition entity-name="AssocRevisionItemView" use-cache="false" >
+ <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
<condition-list combine="and">
- <condition-expr field-name="contentIdTo" operator="equals" env-name="templateContentId" />
- <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="templateContentId" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId" ignore-if-null="true"/>
- <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
+ <condition-expr field-name="contentIdTo" operator="equals" env-name="templateContentId"/>
+ <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="templateContentId"/>
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId" ignore-if-null="true"/>
+ <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
<condition-expr field-name="thruDate" operator="equals" value=""/>
- <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
</condition-list>
</condition-list>
@@ -116,34 +111,31 @@
<select-field field-name="itemContentId"/>
<select-field field-name="maxRevisionSeqId"/>
<select-field field-name="contentId"/>
- <select-field field-name="contentId"/>
<select-field field-name="contentIdTo"/>
<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>
- <node name="node-body" join-field-name="itemContentId" entity-name="AssocRevisionItemView" >
- <entity-one entity-name="Content" use-cache="false">
+ <node name="node-body" join-field-name="itemContentId" entity-name="AssocRevisionItemView">
+ <entity-one entity-name="Content" use-cache="false">
<field-map field-name="contentId" env-name="itemContentId"/>
</entity-one>
- <include-screen name="childInstanceLine"
- location="component://content/widget/compdoc/CompDocScreens.xml" />
+ <include-screen name="childInstanceLine" location="component://content/widget/compdoc/CompDocScreens.xml"/>
<sub-node node-name="node-body">
- <entity-condition entity-name="AssocRevisionItemView" use-cache="false" >
+ <entity-condition entity-name="AssocRevisionItemView" use-cache="false">
<condition-list combine="and">
- <condition-expr field-name="contentIdTo" operator="equals" env-name="contentId" />
- <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="templateContentId" />
- <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId" />
+ <condition-expr field-name="contentIdTo" operator="equals" env-name="contentId"/>
+ <condition-expr field-name="rootRevisionContentId" operator="equals" env-name="templateContentId"/>
+ <condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART"/>
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId"/>
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
<condition-expr field-name="thruDate" operator="equals" value=""/>
- <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
+ <condition-expr field-name="thruDate" operator="greater" env-name="nowTimestamp"/>
</condition-list>
</condition-list>
More information about the Svn
mailing list