svn commit: r1683953 - in /ofbiz/trunk/applications/order: script/org/ofbiz/order/request/CustRequestServices.xml servicedef/services_request.xml webapp/ordermgr/WEB-INF/controller.xml widget/ordermgr/CustRequestForms.xml

[ccarlow]

Author: ccarlow
Date: Sat Jun  6 20:28:34 2015
New Revision: 1683953

URL: http://svn.apache.org/r1683953
Log:
Replacing deleteCustRequestParty with expireCustRequestParty to be exectuted with newly added Expire <hyperlink> and implementing deleteCustRequestParty to perform <remove-value> instead of updating.

https://issues.apache.org/jira/browse/OFBIZ-6463

Modified:
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
    ofbiz/trunk/applications/order/servicedef/services_request.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=1683953&r1=1683952&r2=1683953&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Sat Jun  6 20:28:34 2015
@@ -281,7 +281,7 @@ under the License.
         <store-value value-field="lookedUpValue"/>
         <call-simple-method method-name="updateCustRequestLastModifiedDate"/>
     </simple-method>
-    <simple-method method-name="deleteCustRequestParty" short-description="Delete Customer CustRequestParty">
+    <simple-method method-name="expireCustRequestParty" short-description="Expire Customer CustRequestParty">
         <call-simple-method method-name="checkStatusCustRequest"/>
         <entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/>
         <now-timestamp field="thruDate"/>
@@ -289,6 +289,12 @@ under the License.
         <store-value value-field="lookedUpValue"/>
         <call-simple-method method-name="updateCustRequestLastModifiedDate"/>
     </simple-method>
+    <simple-method method-name="deleteCustRequestParty" short-description="Delete Customer CustRequestParty">
+        <call-simple-method method-name="checkStatusCustRequest"/>
+        <entity-one entity-name="CustRequestParty" value-field="lookedUpValue"/>
+        <remove-value value-field="lookedUpValue"/>
+        <call-simple-method method-name="updateCustRequestLastModifiedDate"/>
+    </simple-method>
     <simple-method method-name="createCustRequestNote" short-description="Create Customer Request Note">
         <make-value value-field="newEntity" entity-name="CustRequestNote"/>
         <set from-field="parameters.custRequestId" field="newEntity.custRequestId"/>

Modified: ofbiz/trunk/applications/order/servicedef/services_request.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_request.xml?rev=1683953&r1=1683952&r2=1683953&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_request.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_request.xml Sat Jun  6 20:28:34 2015
@@ -125,6 +125,11 @@ under the License.
         <description>Delete a CustRequestParty record</description>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
+    <service name="expireCustRequestParty" engine="simple" default-entity-name="CustRequestParty"
+            location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="expireCustRequestParty" auth="true">
+        <description>Delete a CustRequestParty record</description>
+        <auto-attributes mode="IN" include="pk" optional="false"/>
+    </service>
     <service name="createCustRequestNote" engine="simple"
             location="component://order/script/org/ofbiz/order/request/CustRequestServices.xml" invoke="createCustRequestNote" auth="true">
         <description>Create a note for a CustRequest</description>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1683953&r1=1683952&r2=1683953&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Jun  6 20:28:34 2015
@@ -1338,6 +1338,12 @@ under the License.
         <response name="success" type="view" value="RequestRoles"/>
         <response name="error" type="view" value="RequestRoles"/>
     </request-map>
+    <request-map uri="expireCustRequestParty">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="expireCustRequestParty"/>
+        <response name="success" type="view" value="RequestRoles"/>
+        <response name="error" type="view" value="RequestRoles"/>
+    </request-map>
 
     <request-map uri="requestitems"><security https="true" auth="true"/><response name="success" type="view" value="RequestItems"/></request-map>
     <request-map uri="EditRequestItem"><security https="true" auth="true"/><response name="success" type="view" value="EditRequestItem"/></request-map>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1683953&r1=1683952&r2=1683953&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Sat Jun  6 20:28:34 2015
@@ -464,6 +464,14 @@ under the License.
         </field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="expireLink" widget-style="buttontext">
+            <hyperlink description="${uiLabelMap.CommonExpire}" target="expireCustRequestParty">
+                <parameter param-name="custRequestId"/>
+                <parameter param-name="partyId"/>
+                <parameter param-name="roleTypeId"/>
+                <parameter param-name="fromDate"/>
+            </hyperlink>
+        </field>
         <field name="deleteLink" widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCustRequestParty">
                 <parameter param-name="custRequestId"/>