[OFBiz] SVN: r6785 - trunk/applications/content/widget/compdoc
jonesde@svn.ofbiz.org
jonesde at svn.ofbiz.org
Mon Feb 20 14:58:28 CST 2006
Author: jonesde
Date: 2006-02-20 14:58:25 -0600 (Mon, 20 Feb 2006)
New Revision: 6785
Modified:
trunk/applications/content/widget/compdoc/CompDocForms.xml
trunk/applications/content/widget/compdoc/CompDocScreens.xml
Log:
Fixed some validation errors and funny stuff; for CompDoc find change text boxes to be text-find, changed list form to use performFind service; some other misc cleanups
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-20 20:22:27 UTC (rev 6784)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-20 20:58:25 UTC (rev 6785)
@@ -25,7 +25,7 @@
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">
+ <form name="dummy" type="single" 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>
@@ -33,15 +33,13 @@
<field name="contentId" map-name="dummy"><hidden/></field>
<field name="contentRevisionSeqId" map-name="dummy"><hidden/></field>
</form>
+
<!-- CompDoc forms -->
-
<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" map-name="empty"><text/></field>
+ default-entity-name="Content" extends="dummy" target="FindCompDoc" title=" " type="single">
+ <field name="contentName" title="Name"><text-find/></field>
+ <field name="contentId" title="Content Id" map-name="empty"><text-find/></field>
<field name="contentTypeId" title="Content Type Id">
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
<option key="COMPDOC_TEMPLATE" description="Root Template"/>
@@ -50,24 +48,26 @@
<option key="DOCUMENT" description="Instance Child"/>
</drop-down>
</field>
- <!--
- <field name="rootonly" map-name="dummy" title="Root CompDocs Only" >
- <check/>
- </field>
- -->
+ <!-- <field name="rootonly" map-name="dummy" title="Root CompDocs Only"><check/></field> -->
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
<form name="ListCompDoc" default-title-style="tableheadtext" default-tooltip-style="tabletext"
- default-widget-style="tabletext" title="" type="list" list-name="compDocFindList"
- target="" paginate-target="ListCompDoc">
- <field name="contentId" title="Content Id" ><display/></field>
- <field name="contentTypeId" title="Content Type Id" ><display/></field>
- <field name="contentName" title="Name" ><display/></field>
- <field name="edit" title="" use-when="contentTypeId.equals("COMPDOC_TEMPLATE")" >
+ default-widget-style="tabletext" title="" type="list" list-iterator-name="listIt"
+ target="" paginate-target="FindCompDoc">
+ <actions>
+ <service service-name="performFind" result-map-name="results" result-map-list-iterator-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" value="Content"/>
+ </service>
+ </actions>
+ <field name="contentId" title="Content Id"><display/></field>
+ <field name="contentTypeId" title="Content Type Id"><display/></field>
+ <field name="contentName" title="Name"><display/></field>
+ <field name="edit" title="" use-when="contentTypeId.equals("COMPDOC_TEMPLATE")">
<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")" >
+ <field name="edit" title="" use-when="contentTypeId.equals("COMPDOC_INSTANCE")">
<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")">
@@ -81,11 +81,11 @@
<form name="ListCompDocTemplate" default-title-style="tableheadtext" default-tooltip-style="tabletext"
default-widget-style="tabletext" title="" type="list" list-name="compDocFindList"
target="" paginate-target="ListCompDocTemplate">
- <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="caContentAssocTypeId" title="Content Assoc Type ID" ><display/></field>
- <field name="caFromDate" title="From Date" ><display/></field>
+ <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="caContentAssocTypeId" title="Content Assoc Type ID"><display/></field>
+ <field name="caFromDate" title="From Date"><display/></field>
<field name="caThruDate"><hidden/></field>
<field name="editTemplate" title="">
<hyperlink also-hidden="false" description="Edit" target="EditRootCompDocTemplate?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}"/>
@@ -98,10 +98,10 @@
<!-- ContentRevision forms -->
<form name="EditContentRevision" default-map-name="contentRevision" target="updateContentRevision" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <auto-fields-entity entity-name="ContentRevision" />
<alt-target target="createContentRevision" use-when="contentRevision==null"/>
+ <auto-fields-entity entity-name="ContentRevision"/>
- <field name="contentId" title="" widget-style="buttontext" ><lookup target-form-name="LookupContent"/><text/></field>
+ <field name="contentId" title="" widget-style="buttontext"><lookup target-form-name="LookupContent"/></field>
<field name="contentRevisionSeqId" title="" widget-style="inputBox"></field>
<!-- <field name="contentRevisionSeqId">
<drop-down allow-empty="true">
@@ -140,10 +140,10 @@
<form name="EditContentRevisionItem" default-map-name="contentRevisionItem" target="updateContentRevisionItem" title="" type="single"
extends="dummy"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <auto-fields-entity entity-name="ContentRevisionItem" />
<alt-target target="createContentRevisionItem" use-when="contentRevisionItem==null"/>
+ <auto-fields-entity entity-name="ContentRevisionItem" />
- <field name="contentId" title="" widget-style="buttontext" ><lookup target-form-name="LookupContent"/><text/></field>
+ <field name="contentId" title="" widget-style="buttontext"><lookup target-form-name="LookupContent"/></field>
<field name="contentRevisionSeqId" title="" widget-style="inputBox"></field>
<field name="itemContentId" title="" widget-style="inputBox"></field>
<field name="oldDataResourceId" title="" widget-style="inputBox"></field>
@@ -249,7 +249,7 @@
<field name="Edit" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" description="[Edit]" target="EditContentApproval?contentApprovalId=${contentApprovalId}&contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}"/>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit" use-when="contentTypeId.equals("COMPDOC_INSTANCE")" ><submit/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit" use-when="contentTypeId.equals("COMPDOC_INSTANCE")"><submit/></field>
</form>
<form name="CompDocBasic" default-map-name="content" title="" type="single" target="updateRootCompDoc"
@@ -261,14 +261,14 @@
<field name="contentName" field-name="contentName" map-name="content"><text/></field>
<field name="contentTypeId" entry-name="currentContentTypeId" map-name="dummy"
- use-when="content==null || (content != null && org.ofbiz.base.util.UtilValidate.isEmpty(content.getString("contentTypeId")))" >
+ use-when="content==null || (content != null && org.ofbiz.base.util.UtilValidate.isEmpty(content.getString("contentTypeId")))">
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
<option key="COMPDOC_TEMPLATE" description="CompDoc Template"/>
<option key="COMPDOC_INSTANCE" description="CompDoc Instance"/>
</drop-down>
</field>
<field name="contentTypeId" map-name="content"
- use-when="content != null " >
+ use-when="content != null ">
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
<option key="COMPDOC_TEMPLATE" description="CompDoc Template"/>
<option key="COMPDOC_INSTANCE" description="CompDoc Instance"/>
@@ -331,7 +331,6 @@
<field name="objectInfo" field-name="objectInfo" map-name="DataResource"><text/></field>
<field name="imageData" map-name="dummy"><file/></field>
-
</form>
<form name="CompDocRoot" default-map-name="content" title="" type="single" target="updateRootCompDoc"
@@ -346,26 +345,26 @@
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<alt-target use-when="contentId==null" target="createCompDoc"/>
- <field name="contentIdTo" field-name="contentIdTo" ><text/></field>
- <field name="contentAssocTypeId" field-name="contentAssocTypeId" ><text/></field>
- <field use-when="contentAssoc!=null" name="fromDate" ><display/></field>
- <field use-when="contentAssoc==null" name="fromDate" ><hidden value="${nowTimestamp}"/></field>
- <field name="thruDate" ><date-time/></field>
- <field name="contentAssocPredicateId" ><text/></field>
- <field name="sequenceNum" ><text/></field>
- <field name="mapKey" ><text/></field>
- <field name="upperCoordinate" ><text/></field>
- <field name="leftCoordinate" ><text/></field>
+ <field name="contentIdTo" field-name="contentIdTo"><text/></field>
+ <field name="contentAssocTypeId" field-name="contentAssocTypeId"><text/></field>
+ <field use-when="contentAssoc!=null" name="fromDate"><display/></field>
+ <field use-when="contentAssoc==null" name="fromDate"><hidden value="${nowTimestamp}"/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="contentAssocPredicateId"><text/></field>
+ <field name="sequenceNum"><text/></field>
+ <field name="mapKey"><text/></field>
+ <field name="upperCoordinate"><text/></field>
+ <field name="leftCoordinate"><text/></field>
<field name="contentTypeId" entry-name="currentContentTypeId" map-name="dummy"
- use-when="content==null || (content != null && org.ofbiz.base.util.UtilValidate.isEmpty(content.getString("contentTypeId")))" >
+ use-when="content==null || (content != null && org.ofbiz.base.util.UtilValidate.isEmpty(content.getString("contentTypeId")))">
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
<option key="TEMPLATE" description="Member Template"/>
<option key="DOCUMENT" description="Document"/>
</drop-down>
</field>
<field name="contentTypeId" map-name="content"
- use-when="content != null " >
+ use-when="content != null ">
<drop-down no-current-selected-key="COMPDOC_TEMPLATE">
<option key="TEMPLATE" description="Member Template"/>
<option key="DOCUMENT" description="Document"/>
@@ -380,7 +379,7 @@
<field name="contentName"><text/></field>
<field name="instanceOfContentId" entry-name="rootTemplateContentId" map-name="parameters" widget-style="tabletext"><display/></field>
- <field name="contentTypeId" ><hidden value="COMPDOC_INSTANCE"/></field>
+ <field name="contentTypeId"><hidden value="COMPDOC_INSTANCE"/></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -391,7 +390,7 @@
<field name="contentId" widget-style="tabletext"><display/></field>
<field name="contentName"><text/></field>
<field name="instanceOfContentId" widget-style="tabletext"><display/></field>
- <field name="contentTypeId" ><hidden value="COMPDOC_INSTANCE"/></field>
+ <field name="contentTypeId"><hidden value="COMPDOC_INSTANCE"/></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -401,7 +400,7 @@
<field name="contentId"><text/></field>
<field name="contentName"><text/></field>
- <field name="contentTypeId" map-name="dummy" ><hidden value="COMPDOC_TEMPLATE"/></field>
+ <field name="contentTypeId" map-name="dummy"><hidden value="COMPDOC_TEMPLATE"/></field>
<field name="rootTemplateContentId"><hidden /></field>
<field name="rootTemplateRevSeqId"><hidden /></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -413,7 +412,7 @@
<field name="contentId"><text/></field>
<field name="contentName"><text/></field>
- <field name="contentTypeId" map-name="dummy" ><hidden value="COMPDOC_TEMPLATE"/></field>
+ <field name="contentTypeId" map-name="dummy"><hidden value="COMPDOC_TEMPLATE"/></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -423,18 +422,18 @@
<field name="contentId" entry-name="missing" map-name="empty"><text/></field>
<field name="contentName"><text/></field>
- <field name="contentTypeId" ><hidden/></field>
+ <field name="contentTypeId"><hidden/></field>
<field name="instanceOfContentId" use-when="contentTypeId.equals("DOCUMENT")"><display/></field>
<field name="contentIdTo" widget-style="tabletext"><display/></field>
- <field name="contentAssocTypeId" ><display /></field>
- <field name="fromDate" ><display/></field>
- <field name="thruDate" ><date-time/></field>
- <field name="sequenceNum" ><text/></field>
+ <field name="contentAssocTypeId"><display /></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="sequenceNum"><text/></field>
<field name="mimeTypeId" map-name="empty" title="Document Type">
<drop-down allow-empty="true">
<option key="application/msword" description="MS Word"/>
- <option key="application/pdf" description="PDF Form"/>
+ <option key="application/pdf" description="PDF File"/>
<option key="survey" description="Survey"/>
<option key="image/jpeg" description="JPEG"/>
<option key="image/gif" description="GIF"/>
@@ -452,13 +451,13 @@
<field name="contentId"><text/></field>
<field name="contentName" map-name="content"><text/></field>
- <field name="contentTypeId" map-name="content" ><hidden/></field>
+ <field name="contentTypeId" map-name="content"><hidden/></field>
<field name="instanceOfContentId" map-name="content" use-when="contentTypeId.equals("DOCUMENT")"><display/></field>
- <field name="contentIdTo" title="ContentId To" ><display/></field>
- <field name="contentAssocTypeId" title="Content Assoc Type Id" ><display also-hidden="false"/></field>
- <field name="fromDate" title="From Date" ><display/></field>
- <field name="thruDate" title="Thru Date" ><date-time/></field>
- <field name="sequenceNum" title="Sequence Num" ><text/></field>
+ <field name="contentIdTo" title="ContentId To"><display/></field>
+ <field name="contentAssocTypeId" title="Content Assoc Type Id"><display also-hidden="false"/></field>
+ <field name="fromDate" title="From Date"><display/></field>
+ <field name="thruDate" title="Thru Date"><date-time/></field>
+ <field name="sequenceNum" title="Sequence Num"><text/></field>
<field name="mimeTypeId" map-name="dataResource" title="Document Type" widget-style="tabletext"
use-when="contentTypeId.equals("TEMPLATE")">
@@ -484,14 +483,14 @@
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <!-- ================ CompDoc Requests ================= -->
+ <!-- ================ CompDoc Revision ================= -->
<form name="EditContentRevisionAndItem" target="updateContentRevisionAndItem" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<auto-fields-entity entity-name="ContentRevision" />
<auto-fields-entity entity-name="ContentRevisionItem" />
- <field name="contentId" title="" widget-style="buttontext" ><text/></field>
+ <field name="contentId" title="" widget-style="buttontext"><text/></field>
<field name="contentRevisionSeqId" title=""><hidden/></field>
<field name="committedByPartyId" title="" widget-style="inputBox"></field>
<field name="comments" title="" widget-style="inputBox"></field>
@@ -525,7 +524,7 @@
<form name="UploadCompDocContent" type="upload" default-title-style="tableheadtext"
extends="dummy" target="uploadCompDocContent"
- default-tooltip-style="tabletext" default-widget-style="tabletext" >
+ default-tooltip-style="tabletext" default-widget-style="tabletext">
<field name="rootContentId" map-name="dummy"><hidden/></field>
<field name="caContentId" map-name="parameters"><hidden/></field>
<field name="caContentAssocTypeId" map-name="parameters"><hidden/></field>
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-20 20:22:27 UTC (rev 6784)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-20 20:58:25 UTC (rev 6785)
@@ -225,7 +225,7 @@
<screen name="FindCompDoc">
<section>
<condition>
- <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<actions>
@@ -241,14 +241,18 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
+ <container>
+ <link target="AddRootCompDocTemplate?contentTypeId=COMPDOC_TEMPLATE" text="Create New Root CompDoc Template" style="buttontext"/>
+ <link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="View Waiting Approvals" style="buttontext"/>
+ </container>
<include-form name="FindCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
- <link target="AddRootCompDocTemplate?contentTypeId=COMPDOC_TEMPLATE" text="Create New Root CompDoc Template" style="buttontext"/>
- <link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="View Waiting Approvals" style="buttontext"/>
+ <include-form name="ListCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+ <!-- Combining this with FindCompDoc, don't see any reason to have them separate...
<screen name="ListCompDoc">
<section>
<condition>
@@ -263,25 +267,20 @@
<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">
- <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"/>
+ <container>
+ <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"/>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
+ -->
<screen name="ViewInstances">
<section>
@@ -476,8 +475,6 @@
<screen name="ContentViewLink">
<section>
- <condition>
- </condition>
<actions>
</actions>
<widgets>
@@ -553,8 +550,6 @@
<screen name="ViewCompDocContentHtml">
<section>
- <condition>
- </condition>
<actions>
</actions>
<widgets>
More information about the Svn
mailing list