svn commit: r1632801 - in /ofbiz/trunk/applications: order/widget/ordermgr/CustRequestForms.xml order/widget/ordermgr/CustRequestScreens.xml party/widget/partymgr/CommunicationEventForms.xml

[ashish-18]

Author: ashish
Date: Sat Oct 18 14:38:46 2014
New Revision: 1632801

URL: http://svn.apache.org/r1632801
Log:
Applied patch from jira issue - OFBIZ-4668 - CommunicationEventAndRole entity: Field with name custRequestDate not found.
==============================================================================
when displaying this portal page:
https://localhost:8443/myportal/control/main?portalPageId=MYPORTAL_EMPLOYEE0&parentPortalPageId=MYPORTAL_EMPLOYEE

this message is thrown to the console:
Message: Roll back error, could not commit transaction, was rolled back instead because of: Error in Service [executeFind]: Error running Find on the CommunicationEventAndRole entity: Field with name custRequestDate not found in the CommunicationEventAndRole Entity
==============================================================================
Thanks Mridul for the contribution and thanks Erwan for creating the issue.

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1632801&r1=1632800&r2=1632801&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Sat Oct 18 14:38:46 2014
@@ -83,7 +83,7 @@ under the License.
         </actions>
     </form>
 
-    <form name="ListRequestList" type="list" use-row-submit="true" list-name="custRequests" title="List of customer requests"
+    <form name="ListRequestList" type="list" use-row-submit="true" list-name="custRequests" title="List of customer requests" sort-field-parameter-name="custRequestSortField"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="custRequestId" sort-field="true">
             <hyperlink description="${custRequestId}" target="ViewRequest">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1632801&r1=1632800&r2=1632801&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Sat Oct 18 14:38:46 2014
@@ -513,7 +513,7 @@ under the License.
     <screen name="IncomingCustRequests">
         <section>
             <actions>
-                <set field="parameters.sortField" from-field="parameters.sortField" default-value="-custRequestDate"/>
+                <set field="custRequestSortField" from-field="parameters.custRequestSortField" default-value="-custRequestDate"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel">
                     <condition-list combine="and">
@@ -523,7 +523,7 @@ under the License.
                             <condition-expr field-name="partyIdTo" operator="equals" from-field="userLogin.partyId"/>
                         </condition-list>
                     </condition-list>
-                    <order-by field-name="${parameters.sortField}"/>
+                    <order-by field-name="${custRequestSortField}"/>
                 </entity-condition>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1632801&r1=1632800&r2=1632801&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Sat Oct 18 14:38:46 2014
@@ -487,9 +487,9 @@ under the License.
     </form>
     
     <form name="ListPartyCommEvents" type="list" target="RemoveCommunicationEventRole" list-name="listIt"
-        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" sort-field-parameter-name="partyCommEventSortField">
         <actions>
-            <set field="parameters.sortField" from-field="parameters.sortField" default-value="${groovy: 'true'.equals(parameters.all) ? '-entryDate' : 'entryDate'}"/>
+            <set field="parameters.partyCommEventSortField" from-field="parameters.partyCommEventSortField" default-value="${groovy: 'true'.equals(parameters.all) ? '-entryDate' : 'entryDate'}"/>
             <set field="searchParameters.partyId" from-field="partyId"/>
             <set field="searchParameters.statusId" value="COM_UNKNOWN_PARTY"/>
             <set field="searchParameters.statusId_op" value="notEqual"/>
@@ -499,7 +499,7 @@ under the License.
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="searchParameters"/>
                 <field-map field-name="entityName" value="CommunicationEventAndRole"/>
-                <field-map field-name="orderBy" from-field="parameters.sortField"/>
+                <field-map field-name="orderBy" from-field="parameters.partyCommEventSortField"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>