Author: jleroux Date: Sun Oct 19 22:14:00 2014 New Revision: 1633017 URL: http://svn.apache.org/r1633017 Log: "Applied fix from trunk for revision: 1632801 " ------------------------------------------------------------------------ r1632801 | ashish | 2014-10-18 16:38:46 +0200 (sam. 18 oct. 2014) | 10 lignes
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/branches/release12.04/ (props changed) ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/branches/release12.04/applications/party/widget/partymgr/CommunicationEventForms.xml Propchange: ofbiz/branches/release12.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1632801 Modified: ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1633017&r1=1633016&r2=1633017&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestForms.xml Sun Oct 19 22:14:00 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/branches/release12.04/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1633017&r1=1633016&r2=1633017&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/branches/release12.04/applications/order/widget/ordermgr/CustRequestScreens.xml Sun Oct 19 22:14:00 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/branches/release12.04/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1633017&r1=1633016&r2=1633017&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/branches/release12.04/applications/party/widget/partymgr/CommunicationEventForms.xml Sun Oct 19 22:14:00 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>
