You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/07/16 19:49:52 UTC
svn commit: r677360 - in /ofbiz/trunk/applications:
order/entitydef/entitymodel_view.xml
order/webapp/ordermgr/request/RequestForms.xml
order/widget/ordermgr/RequestScreens.xml party/config/PartyUiLabels.xml
party/widget/partymgr/CommunicationScreens.xml
Author: hansbak
Date: Wed Jul 16 10:49:51 2008
New Revision: 677360
URL: http://svn.apache.org/viewvc?rev=677360&view=rev
Log:
show related customer requests on a comunication event view
Modified:
ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?rev=677360&r1=677359&r2=677360&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Wed Jul 16 10:49:51 2008
@@ -1205,6 +1205,23 @@
<key-map field-name="roleTypeId"/>
</relation>
</view-entity>
+ <view-entity entity-name="CustRequestAndCommEvent"
+ package-name="org.ofbiz.order.request"
+ title="Customer Request And CommunicationEvent">
+ <member-entity entity-alias="CR" entity-name="CustRequest"/>
+ <member-entity entity-alias="CRC" entity-name="CustRequestCommEvent"/>
+ <alias-all entity-alias="CR"/>
+ <alias entity-alias="CRC" name="communicationEventId"/>
+ <view-link entity-alias="CR" rel-entity-alias="CRC">
+ <key-map field-name="custRequestId"/>
+ </view-link>
+ <relation type="one-nofk" rel-entity-name="CustRequest">
+ <key-map field-name="custRequestId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="CommunicationEvent">
+ <key-map field-name="communicationEventId"/>
+ </relation>
+ </view-entity>
<view-entity entity-name="CustRequestNoteView"
package-name="org.ofbiz.order.request"
title="Customer Request and Note View Entity">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=677360&r1=677359&r2=677360&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Wed Jul 16 10:49:51 2008
@@ -75,10 +75,8 @@
<form name="ListRequests" type="list" use-row-submit="true" list-name="listIt" title=""
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="FindRequest">
<actions>
- <!--<set field="entityName" value="CustRequestAndRole"/>-->
- <set field="entityName" value="CustRequest"/>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="requestParameters"/>
+ <field-map field-name="inputFields" env-name="parameters"/>
<field-map field-name="entityName" env-name="entityName"/>
<field-map field-name="orderBy" value="-lastModifiedDate"/>
</service>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=677360&r1=677359&r2=677360&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Wed Jul 16 10:49:51 2008
@@ -25,6 +25,7 @@
<actions>
<set field="titleProperty" value="OrderFindRequests"/>
<set field="headerItem" value="request"/>
+ <set field="entityName" value="CustRequest"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=677360&r1=677359&r2=677360&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Wed Jul 16 10:49:51 2008
@@ -1640,6 +1640,9 @@
<value xml:lang="th">รายà¸à¸²à¸£à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">è´ç©å表</value>
</property>
+ <property key="PageTitleListUnknownPartyComms">
+ <value xml:lang="en">Communications from Unknown origin</value>
+ </property>
<property key="PageTitleViewCommPurposes">
<value xml:lang="en">View Communication Purposes</value>
<value xml:lang="es">Ver propósitos de comunicación</value>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=677360&r1=677359&r2=677360&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Wed Jul 16 10:49:51 2008
@@ -216,6 +216,18 @@
name="ViewCommEvent" />
</fail-widgets>
</section>
+ <section>
+ <actions>
+ <set field="entityName" value="CustRequestAndCommEvent"/>
+ <set field="requestParameters.communicationEventId" from-field="parameters.communicationEventId"/>
+ </actions>
+ <widgets>
+ <label style="h1" text="${uiLabelMap.OrderRequestList}"/>
+ <screenlet>
+ <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>