[OFBiz] SVN: r6819 - trunk/applications/content/widget/compdoc
jonesde@svn.ofbiz.org
jonesde at svn.ofbiz.org
Tue Feb 21 23:15:25 CST 2006
Author: jonesde
Date: 2006-02-21 23:15:21 -0600 (Tue, 21 Feb 2006)
New Revision: 6819
Modified:
trunk/applications/content/widget/compdoc/CompDocForms.xml
trunk/applications/content/widget/compdoc/CompDocScreens.xml
Log:
A couple of fixes: now explicitly ignores contentId for create CDI Part; added lookup and link to SurveyResponse, for some reason when set is changing the dataResourceTypeId from SURVEY_RESPONSE to SURVEY; some weird stuff in the persistCompDoc service...
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-22 03:36:37 UTC (rev 6818)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-22 05:15:21 UTC (rev 6819)
@@ -2,7 +2,7 @@
<!--
$Id: $
-Copyright 2001-2006 The Apache Software Foundation
+Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
@@ -22,6 +22,7 @@
<!-- dummy values -->
<form name="dummy" type="single" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+ <!-- This should be reviewed and removed from everywhere except where _necessary_. It is causing problems with passing data around that shouldn't be passed around, like in the add CDI Part form... -->
<field name="rootTemplateContentId" map-name="dummy"><hidden/></field>
<field name="rootInstanceContentId" map-name="dummy"><hidden/></field>
<field name="rootTemplateRevSeqId" map-name="dummy"><hidden/></field>
@@ -254,7 +255,7 @@
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="contentName"><text/></field>
- <field name="instanceOfContentId" entry-name="rootTemplateContentId" map-name="parameters" widget-style="tabletext"><display/></field>
+ <field name="instanceOfContentId" entry-name="rootTemplateContentId" map-name="parameters" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
<field name="contentTypeId"><hidden value="COMPDOC_INSTANCE"/></field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -296,7 +297,7 @@
extends="dummy"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
- <!-- Not sure why this one is here either: <field name="contentId" entry-name="missing" map-name="empty"><text/></field> -->
+ <field name="contentId"><ignored/></field>
<field name="contentName"><text/></field>
<field name="contentTypeId"><hidden/></field>
<field name="instanceOfContentId" use-when="contentTypeId.equals("DOCUMENT")" title="Instance of Content" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
@@ -306,10 +307,10 @@
<field name="thruDate"><date-time/></field>
<field name="sequenceNum"><text/></field>
- <field name="mimeTypeId" map-name="empty" title="Document Type" use-when="instanceOfDataResource!=null&&"SURVEY".equals(instanceOfDataResource.getString("dataResourceTypeId"))">
+ <field name="mimeTypeId" map-name="empty" title="Document Type" use-when=""SURVEY".equals(instanceOfDataResourceTypeId)">
<hidden value="application/vnd.ofbiz.survey.response"/>
</field>
- <field name="mimeTypeId" map-name="empty" title="Document Type" use-when="instanceOfDataResource==null||!"SURVEY".equals(instanceOfDataResource.getString("dataResourceTypeId"))">
+ <field name="mimeTypeId" map-name="empty" title="Document Type" use-when="!"SURVEY".equals(instanceOfDataResourceTypeId)">
<drop-down allow-empty="true">
<option key="application/msword" description="MS Word"/>
<option key="application/pdf" description="PDF File"/>
@@ -333,7 +334,7 @@
<field name="contentId" widget-style="tabletext"><display/></field>
<field name="contentName" map-name="content"><text/></field>
<field name="contentTypeId" map-name="content"><hidden/></field>
- <field name="instanceOfContentId" map-name="content" use-when="contentTypeId.equals("DOCUMENT")"><display/></field>
+ <field name="instanceOfContentId" map-name="content" use-when="contentTypeId.equals("DOCUMENT")" title="Instance of Content" widget-style="tabletext"><display-entity entity-name="Content" key-field-name="contentId" description="${contentName} [${contentId}]"/></field>
<field name="contentIdTo" 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" also-hidden="false"/></field>
<field name="fromDate" title="From Date" widget-style="tabletext"><display/></field>
@@ -368,6 +369,11 @@
<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"))">
+ <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"/>
+ </lookup>
+ </field>
<field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-22 03:36:37 UTC (rev 6818)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-22 05:15:21 UTC (rev 6819)
@@ -583,14 +583,16 @@
<include-form name="UploadCompDocSurveyId" location="component://content/widget/compdoc/CompDocForms.xml"/>
</widgets>
</section>
+ <!--
<section>
<condition>
<if-compare field-name="contentTypeId" operator="equals" value="DOCUMENT"/>
</condition>
<widgets>
- <include-screen name="EditCompDocSurveyResponse" />
+ <link target="" text="" style="buttontext"/>
</widgets>
</section>
+ -->
</widgets>
</section>
<section>
@@ -688,6 +690,7 @@
<entity-one entity-name="Content" value-name="instanceOfContent"/>
<set from-field="instanceOfContent.contentName" field="contentName"/>
<get-related-one value-name="instanceOfContent" relation-name="DataResource" to-value-name="instanceOfDataResource"/>
+ <set field="instanceOfDataResourceTypeId" from-field="instanceOfDataResource.dataResourceTypeId"/>
<set value="COMPDOC_PART" field="contentAssocTypeId"/>
<set value="DOCUMENT" field="contentTypeId"/>
<set from-field="parameters.caSequenceNum" field="sequenceNum" default-value="${parameters.sequenceNum}"/>
@@ -711,13 +714,14 @@
<actions>
<set field="menuName" value="tree"/>
<set field="title" value="Composite Document Template Add Page"/>
- <set from-field="parameters.caContentIdTo" default-value="${parameters.contentIdTo}" field="contentIdTo" />
- <set value="COMPDOC_PART" field="contentAssocTypeId" />
- <set from-field="parameters.caSequenceNum" field="sequenceNum" default-value="${parameters.sequenceNum}"/>
- <set value="TEMPLATE" field="contentTypeId" />
- <set value="" field="rootInstanceContentId" />
- <set value="" field="contentId" />
- <set value="createChildCompDocTemplate" field="childCompDocTarget"/>
+ <set field="contentIdTo" from-field="parameters.caContentIdTo" default-value="${parameters.contentIdTo}"/>
+ <set field="contentAssocTypeId" value="COMPDOC_PART"/>
+ <set field="sequenceNum" from-field="parameters.caSequenceNum" default-value="${parameters.sequenceNum}"/>
+ <set field="contentTypeId" value="TEMPLATE"/>
+ <set field="rootInstanceContentId" value=""/>
+ <set field="contentId" value=""/>
+ <set field="instanceOfDataResourceTypeId" value=""/>
+ <set field="childCompDocTarget" value="createChildCompDocTemplate"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
More information about the Svn
mailing list