svn commit: r1836874 - in /ofbiz/ofbiz-framework/trunk/a
Locked
svn commit: r1836874 - in /ofbiz/ofbiz-framework/trunk/a
 
|
Author: surajk
Date: Sat Jul 28 08:25:25 2018 New Revision: 1836874 URL: http://svn.apache.org/viewvc?rev=1836874&view=rev Log: Improved: Rename deletePartyContactMechPurpose* services with proper names. Thanks everyone for discussions. (OFBIZ-10398) Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechMapProcs.xml ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechServices.xml ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml ofbiz/ofbiz-framework/trunk/applications/party/servicedef/services.xml ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Modified: ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml Sat Jul 28 08:25:25 2018 @@ -891,8 +891,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> <clear-field field="serviceInMap"/> </iterate> <set field="serviceContext.partyId" from-field="userLogin.partyId"/> @@ -923,8 +923,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> </iterate> <set field="shipToAddressCtx.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> <set field="shipToAddressCtx.contactMechId" from-field="nullField"/> @@ -972,8 +972,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> <clear-field field="serviceInMap"/> </iterate> <if-compare field="keepAddressBook" operator="equals" value="N"> @@ -1020,8 +1020,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> <clear-field field="serviceInMap"/> </iterate> <set field="serviceContext.partyId" from-field="userLogin.partyId"/> @@ -1070,8 +1070,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> <clear-field field="serviceInMap"/> </iterate> <set field="serviceContext.partyId" from-field="userLogin.partyId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Jul 28 08:25:25 2018 @@ -820,9 +820,9 @@ under the License. <response name="success" type="view" value="editcontactmech"/> <response name="error" type="view" value="editcontactmech"/> </request-map> - <request-map uri="deletePartyContactMechPurpose"> + <request-map uri="expirePartyContactMechPurpose"> <security https="true" auth="true"/> - <event type="service" invoke="deletePartyContactMechPurpose"/> + <event type="service" invoke="expirePartyContactMechPurpose"/> <response name="success" type="view" value="editcontactmech"/> <response name="error" type="view" value="editcontactmech"/> </request-map> Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechMapProcs.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechMapProcs.xml?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechMapProcs.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechMapProcs.xml Sat Jul 28 08:25:25 2018 @@ -59,7 +59,7 @@ under the License. <process field="contactMechId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> <process field="contactMechPurposeTypeId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPurposeTypeMissingCannotAdd"/></not-empty></process> </simple-map-processor> - <simple-map-processor name="deletePartyContactMechPurpose"> + <simple-map-processor name="expirePartyContactMechPurpose"> <process field="partyId"><copy/></process> <process field="contactMechId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> <process field="contactMechPurposeTypeId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPurposeTypeMissingCannotRemove"/></not-empty></process> Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechServices.xml?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/contact/PartyContactMechServices.xml Sat Jul 28 08:25:25 2018 @@ -458,8 +458,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> <clear-field field="serviceInMap"/> </iterate> <set field="serviceContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> @@ -476,8 +476,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> </iterate> <set field="serviceContext.contactMechPurposeTypeId" value="BILLING_LOCATION"/> <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/> @@ -561,8 +561,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> <clear-field field="serviceInMap"/> </iterate> <set field="serviceContext.contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> @@ -592,8 +592,8 @@ under the License. <field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/> </entity-and> <iterate list="pcmpList" entry="pcmp"> - <set-service-fields service-name="deletePartyContactMechPurposeIfExists" map="pcmp" to-map="serviceInMap"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceInMap"/> + <set-service-fields service-name="expirePartyContactMechPurpose" map="pcmp" to-map="serviceInMap"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/> </iterate> <set field="serviceContext.contactMechPurposeTypeId" value="BILLING_LOCATION"/> <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceContext"/> Modified: ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/minilang/test/PartyTests.xml Sat Jul 28 08:25:25 2018 @@ -876,7 +876,7 @@ under the License. <check-errors/> </simple-method> - <simple-method method-name="testDeletePartyContactMechPurpose" short-description="Test the service deletePartyContactMechPurpose" login-required="false"> + <simple-method method-name="testExpirePartyContactMechPurpose" short-description="Test the service expirePartyContactMechPurpose" login-required="false"> <set field="serviceCtx.partyId" value="TestCustomer"/> <set field="serviceCtx.contactMechId" value="TestContactMech"/> <set field="serviceCtx.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> @@ -885,35 +885,13 @@ under the License. <field-map field-name="userLoginId" value="system"/> </entity-one> <set field="serviceCtx.userLogin" from-field="userLogin"/> - <call-service service-name="deletePartyContactMechPurpose" in-map-name="serviceCtx"/> + <call-service service-name="expirePartyContactMechPurpose" in-map-name="serviceCtx"/> <entity-one entity-name="PartyContactMechPurpose" value-field="partyContactMechPurpose"> <field-map field-name="partyId" value="TestCustomer"/> <field-map field-name="contactMechId" value="TestContactMech"/> <field-map field-name="contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> <field-map field-name="fromDate" value="2000-01-01 00:00:00"/> </entity-one> - <assert> - <not><if-empty field="partyContactMechPurpose"/></not> - <not><if-empty field="partyContactMechPurpose.thruDate"/></not> - </assert> - <check-errors/> - </simple-method> - - <simple-method method-name="testDeletePartyContactMechPurposeIfExists" short-description="Test the service deletePartyContactMechPurposeIfExists" login-required="false"> - <set field="serviceCtx.partyId" value="TestCustomer"/> - <set field="serviceCtx.contactMechId" value="TestContactMech2"/> - <set field="serviceCtx.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> - <entity-one entity-name="UserLogin" value-field="userLogin"> - <field-map field-name="userLoginId" value="system"/> - </entity-one> - <set field="serviceCtx.userLogin" from-field="userLogin"/> - <call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="serviceCtx"/> - <entity-one entity-name="PartyContactMechPurpose" value-field="partyContactMechPurpose"> - <field-map field-name="partyId" value="TestCustomer"/> - <field-map field-name="contactMechId" value="TestContactMech2"/> - <field-map field-name="contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> - <field-map field-name="fromDate" value="2000-01-01 00:00:00"/> - </entity-one> <assert> <not><if-empty field="partyContactMechPurpose"/></not> <not><if-empty field="partyContactMechPurpose.thruDate"/></not> Modified: ofbiz/ofbiz-framework/trunk/applications/party/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/servicedef/services.xml?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/servicedef/services.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/servicedef/services.xml Sat Jul 28 08:25:25 2018 @@ -626,20 +626,15 @@ under the License. <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="false"/> <attribute name="fromDate" type="Timestamp" mode="INOUT" optional="true"/> </service> - <service name="deletePartyContactMechPurpose" engine="java" - location="org.apache.ofbiz.party.contact.ContactMechServices" invoke="deletePartyContactMechPurpose" auth="true"> - <description>Delete a Party ContactMech Purpose</description> - <attribute name="partyId" type="String" mode="IN" optional="true"/> - <attribute name="contactMechId" type="String" mode="IN" optional="false"/> - <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="false"/> - <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/> + <service name="deletePartyContactMechPurpose" default-entity-name="PartyContactMechPurpose" engine="entity-auto" invoke="delete"> + <description>Delete a Party Contact Mech Purpose</description> + <permission-service service-name="partyIdPermissionCheck" main-action="DELETE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> </service> - <service name="deletePartyContactMechPurposeIfExists" engine="java" - location="org.apache.ofbiz.party.contact.ContactMechServices" invoke="deletePartyContactMechPurposeIfExists" auth="true"> - <description>Delete a Party ContactMech Purpose</description> - <attribute name="partyId" type="String" mode="IN" optional="true"/> - <attribute name="contactMechId" type="String" mode="IN" optional="false"/> - <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="false"/> + <service name="expirePartyContactMechPurpose" default-entity-name="PartyContactMechPurpose" engine="entity-auto" invoke="expire"> + <description>Expires a Party Contact Mech Purpose</description> + <permission-service service-name="partyContactMechPermissionCheck" main-action="DELETE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> </service> <!-- ContactMechLink services --> Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/contact/ContactMechServices.java Sat Jul 28 08:25:25 2018 @@ -875,109 +875,6 @@ public class ContactMechServices { return result; } - public static Map<String, Object> deletePartyContactMechPurposeIfExists(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<>(); - Delegator delegator = ctx.getDelegator(); - Security security = ctx.getSecurity(); - GenericValue userLogin = (GenericValue) context.get("userLogin"); - Locale locale = (Locale) context.get("locale"); - - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_DELETE"); - - if (result.size() > 0) { - return result; - } - - // required parameters - String contactMechId = (String) context.get("contactMechId"); - String contactMechPurposeTypeId = (String) context.get("contactMechPurposeTypeId"); - - GenericValue tempVal = null; - try { - tempVal = EntityQuery.use(delegator).from("PartyContactWithPurpose") - .where("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId) - .filterByDate("contactFromDate", "contactThruDate", "purposeFromDate", "purposeThruDate") - .queryFirst(); - } catch (GenericEntityException e) { - Debug.logWarning(e.getMessage(), module); - tempVal = null; - } - if (tempVal != null) { - Map<String, Object> deletePcmCtx = UtilMisc.toMap("contactMechId", context.get("contactMechId")); - deletePcmCtx.put("contactMechPurposeTypeId", context.get("contactMechPurposeTypeId")); - deletePcmCtx.put("fromDate", tempVal.get("purposeFromDate")); - deletePcmCtx.put("userLogin", context.get("userLogin")); - deletePcmCtx.put("partyId", partyId); - try { - Map<String, Object> deletePcmResult = ctx.getDispatcher().runSync("deletePartyContactMechPurpose", deletePcmCtx); - if (ServiceUtil.isError(deletePcmResult)) { - return ServiceUtil.returnError(ServiceUtil.getErrorMessage(deletePcmResult)); - } - } catch (GenericServiceException e) { - Debug.logWarning(e.getMessage(), module); - return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, - "contactmechservices.could_not_delete_purpose_from_contact_mechanism_read", - UtilMisc.toMap("errMessage", e.getMessage()), locale)); - } - } - result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); - return result; - - } - /** - * Deletes the PartyContactMechPurpose corresponding to the parameters in the context - * <b>security check</b>: userLogin partyId must equal partyId, or must have PARTYMGR_DELETE permission - *@param ctx The DispatchContext that this service is operating in - *@param context Map containing the input parameters - *@return Map with the result of the service, the output parameters - */ - public static Map<String, Object> deletePartyContactMechPurpose(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = new HashMap<>(); - Delegator delegator = ctx.getDelegator(); - Security security = ctx.getSecurity(); - GenericValue userLogin = (GenericValue) context.get("userLogin"); - Locale locale = (Locale) context.get("locale"); - - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_DELETE"); - - if (result.size() > 0) { - return result; - } - - // required parameters - String contactMechId = (String) context.get("contactMechId"); - String contactMechPurposeTypeId = (String) context.get("contactMechPurposeTypeId"); - Timestamp fromDate = (Timestamp) context.get("fromDate"); - - GenericValue pcmp = null; - - try { - pcmp = EntityQuery.use(delegator).from("PartyContactMechPurpose").where("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId, "fromDate", fromDate).queryOne(); - if (pcmp == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, - "contactmechservices.could_not_delete_purpose_from_contact_mechanism_not_found", locale)); - } - } catch (GenericEntityException e) { - Debug.logWarning(e.getMessage(), module); - return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, - "contactmechservices.could_not_delete_purpose_from_contact_mechanism_read", - UtilMisc.toMap("errMessage", e.getMessage()), locale)); - } - - pcmp.set("thruDate", UtilDateTime.nowTimestamp()); - try { - pcmp.store(); - } catch (GenericEntityException e) { - Debug.logWarning(e.getMessage(), module); - return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, - "contactmechservices.could_not_delete_purpose_from_contact_mechanism_write", - UtilMisc.toMap("errMessage", e.getMessage()), locale)); - } - - result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "PartyContactMechanismSuccessfullyDeleted", locale)); - return result; - } - /** * Just wraps the ContactMechWorker method of the same name. * Modified: ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/template/party/EditContactMech.ftl Sat Jul 28 08:25:25 2018 @@ -77,14 +77,14 @@ under the License. <#if partyContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpire}: ${partyContactMechPurpose.thruDate.toString()}</#if> </td> <td class="button-col"> - <form name="deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}" method="post" action="<@ofbizUrl>deletePartyContactMechPurpose</@ofbizUrl>" > + <form name="expirePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}" method="post" action="<@ofbizUrl>expirePartyContactMechPurpose</@ofbizUrl>" > <input type="hidden" name="partyId" value="${partyId}" /> <input type="hidden" name="contactMechId" value="${contactMechId}" /> <input type="hidden" name="contactMechPurposeTypeId" value="${partyContactMechPurpose.contactMechPurposeTypeId}" /> <input type="hidden" name="fromDate" value="${partyContactMechPurpose.fromDate.toString()}" /> <input type="hidden" name="DONE_PAGE" value="${donePage?replace("=","%3d")}" /> <input type="hidden" name="useValues" value="true" /> - <a href="javascript:document.deletePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> + <a href="javascript:document.expirePartyContactMechPurpose_${partyContactMechPurpose.contactMechPurposeTypeId}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> </tr> Modified: ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1836874&r1=1836873&r2=1836874&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Jul 28 08:25:25 2018 @@ -210,9 +210,9 @@ under the License. <response name="success" type="view" value="editcontactmech"/> <response name="error" type="view" value="editcontactmech"/> </request-map> - <request-map uri="deletePartyContactMechPurpose"> + <request-map uri="expirePartyContactMechPurpose"> <security https="true" auth="true"/> - <event type="service" invoke="deletePartyContactMechPurpose"/> + <event type="service" invoke="expirePartyContactMechPurpose"/> <response name="success" type="view" value="editcontactmech"/> <response name="error" type="view" value="editcontactmech"/> </request-map> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |