Author: jleroux
Date: Sat Oct 27 13:06:45 2007
New Revision: 589201
URL: http://svn.apache.org/viewvc?rev=589201&view=rev
Log:
Applied fix from trunk for revision: 589200
Modified:
ofbiz/branches/release4.0/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml
Modified:
ofbiz/branches/release4.0/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=589201&r1=589200&r2=589201&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
(original)
+++
ofbiz/branches/release4.0/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
Sat Oct 27 13:06:45 2007
@@ -18,8 +18,8 @@
under the License.
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://www.ofbiz.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/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml?rev=589201&r1=589200&r2=589201&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml
(original)
+++
ofbiz/branches/release4.0/applications/party/webapp/partymgr/communication/CommForms.xml
Sat Oct 27 13:06:45 2007
@@ -95,7 +95,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}"
@@ -171,11 +171,11 @@
<field name="communicationEventId" use-when="communicationEvent !=
null"><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">
@@ -284,7 +284,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>
@@ -352,7 +352,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>
@@ -399,7 +399,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>
@@ -424,9 +424,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> -->
@@ -451,16 +451,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>
