You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/10/27 22:04:56 UTC
svn commit: r589200 - in /ofbiz/trunk/applications:
order/widget/ordermgr/QuoteWorkEffortForms.xml
party/webapp/partymgr/communication/CommForms.xml
Author: jleroux
Date: Sat Oct 27 13:04:55 2007
New Revision: 589200
URL: http://svn.apache.org/viewvc?rev=589200&view=rev
Log:
I forgot to commit these changes when commiting rev. 582338. The text was :
This solve the "Quote WorkEffort bug" issue reported by Bilgin Ibryam (https://issues.apache.org/jira/browse/OFBIZ-1180) - OFBIZ-1180.
It does not solve the issue reported in comment https://issues.apache.org/jira/browse/OFBIZ-1180#action_12524674 "Adding WorkEffort to Communications in party manager is also broken due to extending EditWorkEffort." because then we get java.lang.IllegalArgumentException: Could not find screen with name [EditCommEventWorkEffort] in class resource [component://party/widget/partymgr/CommunicationScreens.xml]. But this is another problem :
I will back port this in release as it does fix a bug (it's possible to add now a workeffort in a quote but was not before)
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=589200&r1=589199&r2=589200&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Sat Oct 27 13:04:55 2007
@@ -18,8 +18,8 @@
under the License.
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
- <form name="ListQuoteWorkEfforts" separate-columns="true" title="" type="list" target="ListQuoteWorkEfforts"
+
+ <form name="ListQuoteWorkEfforts" separate-columns="true" title="" type="list" target="ListQuoteWorkEfforts"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
<actions>
<entity-and entity-name="QuoteWorkEffortView">
@@ -40,10 +40,10 @@
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteQuoteWorkEffort?workEffortId=${workEffortId}&quoteId=${quoteId}"/>
</field>
</form>
-
- <form name="AddQuoteWorkEffort" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml" target="createQuoteWorkEffort" title="" type="single"
+
+ <form name="AddQuoteWorkEffort" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml" target="/ordermgr/control/createQuoteWorkEffort" target-type="inter-app" title="" type="single"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
-
+
<field name="quoteId" map-name="parameters"><display/></field>
<field name="workEffortId" use-when="workEffort==null&&workEffortId!=null">
<lookup target-form-name="/workeffort/control/LookupWorkEffort"/>
@@ -58,7 +58,7 @@
<banner left-text-style="tabletext" left-text="${uiLabelMap.OrderOrderQuoteEnterWorkEffortIdNew}"/>
</sort-order>
</form>
-
+
<form name="EditQuoteWorkEffort" target="updateQuoteWorkEffort" title="" type="single" extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<actions>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=589200&r1=589199&r2=589200&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sat Oct 27 13:04:55 2007
@@ -141,7 +141,7 @@
<field name="contactMechIdTo" title="${uiLabelMap.PartyToEmailAddress}"
use-when="(parameters.get("communicationEventTypeId")!=null)&&(parameters.get("communicationEventTypeId").equals("EMAIL_COMMUNICATION"))">
<drop-down allow-empty="false" current="selected" no-current-selected-key="${parameters.contactMechIdTo}">
- <list-options key-name="contactMechId" list-name="targetEmailAddresses" description="${infoString}"/>
+ <list-options key-name="contactMechId" list-name="targetEmailAddresses" description="${infoString}"/>
</drop-down>
</field>
<field name="contactMechIdTo" title="${uiLabelMap.PartyToContactMech}"
@@ -250,11 +250,11 @@
<field name="origCommEventId"><text-find/></field>
<field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
<field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="communicationEventTypeId">
+ <field name="communicationEventTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
- </drop-down>
- </field>
+ </drop-down>
+ </field>
<field name="statusId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
@@ -382,7 +382,7 @@
<form name="AddCommEventWorkEffort" type="single" extends="EditWorkEffort"
extends-resource="component://workeffort/widget/WorkEffortForms.xml"
- target="createCommEventWorkEffort">
+ target="/partymgr/control/createCommEventWorkEffort" target-type="inter-app">
<field name="communicationEventId"><display/></field>
<field name="workEffortId" use-when="workEffort==null&&workEffortId==null" ><lookup target-form-name="/workeffort/control/LookupWorkEffort"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/> </field>
@@ -450,7 +450,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.PartyAddRole}"><submit button-type="button"/></field>
</form>
-
+
<form name="listCommContent" type="list" list-name="contentDataResourceList"
paginate-target="/ListCommContent" view-size="20">
<actions>
@@ -497,7 +497,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
-
+
<form name="editCommContent" type="single" target="updateCommContentDataResource" default-map-name="commEventContentDataResource">
<field name="communicationEventId"><display/></field>
<field name="contentId"><display/></field>
@@ -522,9 +522,9 @@
</field>
<field name="dataResourceTypeId" entry-name="drDataResourceTypeId">
<drop-down allow-empty="false">
- <entity-options entity-name="DataResourceType" description="${description}">
-
- </entity-options>
+ <entity-options entity-name="DataResourceType" description="${description}">
+
+ </entity-options>
</drop-down>
</field>
<!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type"><display/></field> -->
@@ -549,16 +549,16 @@
<hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}" also-hidden="false" target-window="_blank"/>
</field>
-->
- <!--
+ <!--
<field name="objectInfo" title="Current File Name" map-name="dataResource"
use-when="mimeTypeId!=null && !mimeTypeId.startsWith("text")">
<display also-hidden="false"/>
</field>
- -->
+ -->
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
-
+
<form name="uploadCommContent" type="upload" target="uploadCommEventContent" default-map-name="commEventContentDataResource">
<field name="contentId" map-name="contentAssoc"><hidden/></field>
<field name="drDataResourceId"><hidden/></field>