svn commit: r667748 [9/16] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r667748 [9/16] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleMethods.xml Fri Jun 13 23:03:12 2008 @@ -24,11 +24,11 @@ <make-value value-name="lookupPKMap" entity-name="PartyIcsAvsOverride"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="PartyIcsAvsOverride" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-not-empty map-name="lookedUpValue" field-name="partyId"> + <if-not-empty field="lookedUpValue.partyId"> <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> <store-value value-name="lookedUpValue"/> </if-not-empty> - <if-empty map-name="lookedUpValue" field-name="partyId"> + <if-empty field="lookedUpValue.partyId"> <set-nonpk-fields map-name="parameters" value-name="lookupPKMap"/> <create-value value-name="lookupPKMap"/> </if-empty> @@ -38,20 +38,20 @@ <make-value value-name="lookupPKMap" entity-name="PartyIcsAvsOverride"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="PartyIcsAvsOverride" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-not-empty map-name="lookedUpValue" field-name="partyId"> + <if-not-empty field="lookedUpValue.partyId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> </simple-method> <simple-method method-name="ensureNaPartyRole" short-description="Ensure Party is in _NA_ or the specified Role" login-required="false"> <!-- must have a partyId, partyIdFrom, or partyIdTo in the parameters map, should be called through different service defs for each one --> - <if-not-empty field-name="parameters.partyId"> + <if-not-empty field="parameters.partyId"> <set field="lookupPKMap.partyId" from-field="parameters.partyId"/> <else> - <if-not-empty field-name="parameters.partyIdFrom"> + <if-not-empty field="parameters.partyIdFrom"> <set field="lookupPKMap.partyId" from-field="parameters.partyIdFrom"/> <else> - <if-not-empty field-name="parameters.partyIdTo"> + <if-not-empty field="parameters.partyIdTo"> <set field="lookupPKMap.partyId" from-field="parameters.partyIdTo"/> </if-not-empty> </else> @@ -59,14 +59,14 @@ </else> </if-not-empty> - <if-empty field-name="parameters.roleTypeId"> + <if-empty field="parameters.roleTypeId"> <set field="lookupPKMap.roleTypeId" value="_NA_"/> <else> <set from-field="parameters.roleTypeId" field="lookupPKMap.roleTypeId"/> </else> </if-empty> <find-by-primary-key entity-name="PartyRole" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-empty field-name="lookedUpValue"> + <if-empty field="lookedUpValue"> <make-value value-name="newValue" entity-name="PartyRole" map-name="lookupPKMap"/> <create-value value-name="newValue"/> </if-empty> @@ -100,12 +100,12 @@ <call-map-processor processor-name="postalAddress" in-map-name="parameters" out-map-name="postalAddressContext" xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"/> - <if-not-empty field-name="parameters.contactNumber"> + <if-not-empty field="parameters.contactNumber"> <call-map-processor processor-name="telecomNumber" in-map-name="parameters" out-map-name="telecomNumberContext" xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"/> </if-not-empty> - <if-not-empty field-name="parameters.emailAddress"> + <if-not-empty field="parameters.emailAddress"> <call-map-processor in-map-name="parameters" out-map-name="emailAddressContext"> <simple-map-processor name="emailAddress"> <process field="emailAddress"> @@ -121,7 +121,7 @@ <result-to-field result-name="partyId" field-name="partyId"/> </call-service> - <if-not-empty field-name="parameters.roleTypeId"> + <if-not-empty field="parameters.roleTypeId"> <set field="createPartyRoleCtx.partyId" from-field="partyId"/> <set field="createPartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/> <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/> @@ -143,12 +143,12 @@ <call-map-processor processor-name="postalAddress" in-map-name="parameters" out-map-name="postalAddressContext" xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"/> - <if-not-empty field-name="parameters.contactNumber"> + <if-not-empty field="parameters.contactNumber"> <call-map-processor processor-name="telecomNumber" in-map-name="parameters" out-map-name="telecomNumberContext" xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"/> </if-not-empty> - <if-not-empty field-name="parameters.emailAddress"> + <if-not-empty field="parameters.emailAddress"> <call-map-processor in-map-name="parameters" out-map-name="emailAddressContext"> <simple-map-processor name="emailAddress"> <process field="emailAddress"> @@ -165,7 +165,7 @@ <result-to-field result-name="partyId" field-name="partyId"/> </call-service> - <if-not-empty field-name="parameters.roleTypeId"> + <if-not-empty field="parameters.roleTypeId"> <set field="createPartyRoleCtx.partyId" from-field="partyId"/> <set field="createPartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/> <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/> @@ -189,27 +189,27 @@ <result-to-field result-name="contactMechId" map-name="postalAddressContext"/> </call-service> - <if-not-empty field-name="postalAddContactMechPurpTypeId"> + <if-not-empty field="postalAddContactMechPurpTypeId"> <set-service-fields service-name="createPartyContactMechPurpose" map-name="postalAddressContext" to-map-name="serviceCtx"/> <set field="serviceCtx.contactMechPurposeTypeId" from-field="postalAddContactMechPurpTypeId"/> <call-service service-name="createPartyContactMechPurpose" in-map-name="serviceCtx"/> </if-not-empty> <!-- phone number --> - <if-not-empty field-name="contactNumber"> + <if-not-empty field="contactNumber"> <set field="telecomNumberContext.partyId" from-field="partyId"/> <set field="telecomNumberContext.contactMechPurposeTypeId" value="PRIMARY_PHONE"/> - <if-not-empty field-name="phoneContactMechPurpTypeId"> <!-- override with purpose present in parameters, if any (This field is not used now, just here for future implementations) --> + <if-not-empty field="phoneContactMechPurpTypeId"> <!-- override with purpose present in parameters, if any (This field is not used now, just here for future implementations) --> <set field="telecomNumberContext.contactMechPurposeTypeId" from-field="phoneContactMechPurpTypeId"/> </if-not-empty> <call-service service-name="createPartyTelecomNumber" in-map-name="telecomNumberContext"/> </if-not-empty> <!-- email address --> - <if-not-empty field-name="emailAddress"> + <if-not-empty field="emailAddress"> <set field="emailAddressContext.partyId" from-field="partyId"/> <set field="emailAddressContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> - <if-not-empty field-name="emailContactMechPurpTypeId"> <!-- override with purpose present in parameters, if any (This field is not used now, just here for future implementations) --> + <if-not-empty field="emailContactMechPurpTypeId"> <!-- override with purpose present in parameters, if any (This field is not used now, just here for future implementations) --> <set field="emailAddressContext.contactMechPurposeTypeId" from-field="emailContactMechPurpTypeId"/> </if-not-empty> <call-service service-name="createPartyEmailAddress" in-map-name="emailAddressContext"/> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Fri Jun 13 23:03:12 2008 @@ -41,10 +41,10 @@ </call-service> <find-by-primary-key entity-name="PartyRoleDetailAndPartyDetail" map-name="searchParams" value-name="partyRoleDetailAndPartyDetail"/> - <if-not-empty field-name="partyRoleDetailAndPartyDetail"> - <assert><not><if-empty field-name="partyList"/></not></assert> + <if-not-empty field="partyRoleDetailAndPartyDetail"> + <assert><not><if-empty field="partyList"/></not></assert> <else> - <assert><if-empty field-name="partyList"/></assert> + <assert><if-empty field="partyList"/></assert> </else> </if-not-empty> <check-errors/> @@ -66,7 +66,7 @@ <result-to-field result-name="partyList"/> </call-service> <!-- At least one party will always exists in the system in any case --> - <assert><not><if-empty field-name="partyList"/></not></assert> + <assert><not><if-empty field="partyList"/></not></assert> <check-errors/> </simple-method> @@ -105,9 +105,9 @@ <log level="info" message="====== contactMechId [${contactMechId}] ======"/> <entity-one entity-name="ContactMech" value-name="contactMech"/> <assert> - <not><if-empty field-name="contactMech"/></not> - <if-compare-field field-name="contactMechId" operator="equals" to-field-name="serviceCtx.contactMechId"/> - <if-compare-field field-name="contactMech.infoString" operator="equals" to-field-name="serviceCtx.emailAddress"/> + <not><if-empty field="contactMech"/></not> + <if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/> + <if-compare-field field="contactMech.infoString" to-field="serviceCtx.emailAddress" operator="equals"/> </assert> <check-errors/> @@ -122,9 +122,9 @@ <field-map field-name="contactMechId" env-name="newContactMechId"/> </entity-one> <assert> - <not><if-empty field-name="contactMech"/></not> - <if-compare-field field-name="newContactMechId" operator="not-equals" to-field-name="serviceCtx.contactMechId"/> - <if-compare-field field-name="contactMech.infoString" operator="equals" to-field-name="serviceCtx.emailAddress"/> + <not><if-empty field="contactMech"/></not> + <if-compare-field field="newContactMechId" to-field="serviceCtx.contactMechId" operator="not-equals"/> + <if-compare-field field="contactMech.infoString" to-field="serviceCtx.emailAddress" operator="equals"/> </assert> <check-errors/> </simple-method> @@ -162,15 +162,15 @@ <log level="info" message="====== contactMechId [${contactMechId}] ======"/> <entity-one entity-name="ContactMech" value-name="contactMech"/> <assert> - <not><if-empty field-name="contactMech"/></not> - <if-compare-field field-name="contactMechId" operator="equals" to-field-name="serviceCtx.contactMechId"/> + <not><if-empty field="contactMech"/></not> + <if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/> </assert> <clear-field field-name="telecomNumber"/> <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-name="telecomNumber"/> <assert> - <not><if-empty field-name="telecomNumber"/></not> - <if-compare-field field-name="telecomNumber.areaCode" operator="equals" to-field-name="serviceCtx.areaCode"/> - <if-compare-field field-name="telecomNumber.contactNumber" operator="equals" to-field-name="serviceCtx.contactNumber"/> + <not><if-empty field="telecomNumber"/></not> + <if-compare-field field="telecomNumber.areaCode" to-field="serviceCtx.areaCode" operator="equals"/> + <if-compare-field field="telecomNumber.contactNumber" to-field="serviceCtx.contactNumber" operator="equals"/> </assert> <check-errors/> @@ -187,13 +187,13 @@ <field-map field-name="contactMechId" env-name="newContactMechId"/> </entity-one> <assert> - <not><if-empty field-name="contactMech"/></not> - <if-compare-field field-name="newContactMechId" operator="not-equals" to-field-name="serviceCtx.contactMechId"/> + <not><if-empty field="contactMech"/></not> + <if-compare-field field="newContactMechId" to-field="serviceCtx.contactMechId" operator="not-equals"/> </assert> <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-name="telecomNumber"/> <assert> - <not><if-empty field-name="telecomNumber"/></not> - <if-compare-field field-name="telecomNumber.contactNumber" operator="equals" to-field-name="serviceCtx.contactNumber"/> + <not><if-empty field="telecomNumber"/></not> + <if-compare-field field="telecomNumber.contactNumber" to-field="serviceCtx.contactNumber" operator="equals"/> </assert> <check-errors/> </simple-method> @@ -231,16 +231,16 @@ <log level="info" message="====== contactMechId [${contactMechId}] ======"/> <entity-one entity-name="ContactMech" value-name="contactMech"/> <assert> - <not><if-empty field-name="contactMech"/></not> - <if-compare-field field-name="contactMechId" operator="equals" to-field-name="serviceCtx.contactMechId"/> + <not><if-empty field="contactMech"/></not> + <if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/> </assert> <clear-field field-name="postalAddress"/> <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-name="postalAddress"/> <assert> - <not><if-empty field-name="postalAddress"/></not> - <if-compare-field field-name="postalAddress.address1" operator="equals" to-field-name="serviceCtx.address1"/> - <if-compare-field field-name="postalAddress.stateProvinceGeoId" operator="equals" to-field-name="serviceCtx.stateProvinceGeoId"/> - <if-compare-field field-name="postalAddress.postalCode" operator="equals" to-field-name="serviceCtx.postalCode"/> + <not><if-empty field="postalAddress"/></not> + <if-compare-field field="postalAddress.address1" to-field="serviceCtx.address1" operator="equals"/> + <if-compare-field field="postalAddress.stateProvinceGeoId" to-field="serviceCtx.stateProvinceGeoId" operator="equals"/> + <if-compare-field field="postalAddress.postalCode" to-field="serviceCtx.postalCode" operator="equals"/> </assert> <check-errors/> @@ -258,14 +258,14 @@ <field-map field-name="contactMechId" env-name="newContactMechId"/> </entity-one> <assert> - <not><if-empty field-name="contactMech"/></not> - <if-compare-field field-name="newContactMechId" operator="not-equals" to-field-name="serviceCtx.contactMechId"/> + <not><if-empty field="contactMech"/></not> + <if-compare-field field="newContactMechId" to-field="serviceCtx.contactMechId" operator="not-equals"/> </assert> <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-name="postalAddress"/> <assert> - <not><if-empty field-name="postalAddress"/></not> - <if-compare-field field-name="postalAddress.stateProvinceGeoId" operator="equals" to-field-name="serviceCtx.stateProvinceGeoId"/> - <if-compare-field field-name="postalAddress.postalCode" operator="equals" to-field-name="serviceCtx.postalCode"/> + <not><if-empty field="postalAddress"/></not> + <if-compare-field field="postalAddress.stateProvinceGeoId" to-field="serviceCtx.stateProvinceGeoId" operator="equals"/> + <if-compare-field field="postalAddress.postalCode" to-field="serviceCtx.postalCode" operator="equals"/> </assert> <check-errors/> </simple-method> @@ -303,10 +303,10 @@ <clear-field field-name="paymentMethodAndCreditCard"/> <entity-one entity-name="PaymentMethodAndCreditCard" value-name="paymentMethodAndCreditCard"/> <assert> - <not><if-empty field-name="paymentMethodAndCreditCard"/></not> - <if-compare-field field-name="paymentMethodId" operator="equals" to-field-name="oldPaymentMethodId"/> - <if-compare-field field-name="paymentMethodAndCreditCard.cardType" operator="equals" to-field-name="serviceCtx.cardType"/> - <if-compare-field field-name="paymentMethodAndCreditCard.cardNumber" operator="equals" to-field-name="serviceCtx.cardNumber"/> + <not><if-empty field="paymentMethodAndCreditCard"/></not> + <if-compare-field field="paymentMethodId" to-field="oldPaymentMethodId" operator="equals"/> + <if-compare-field field="paymentMethodAndCreditCard.cardType" to-field="serviceCtx.cardType" operator="equals"/> + <if-compare-field field="paymentMethodAndCreditCard.cardNumber" to-field="serviceCtx.cardNumber" operator="equals"/> </assert> <check-errors/> @@ -324,10 +324,10 @@ <log level="info" message="====== New paymentMethodId [${paymentMethodId}] created for party [${serviceCtx.partyId}] ======"/> <entity-one entity-name="PaymentMethodAndCreditCard" value-name="paymentMethodAndCreditCard"/> <assert> - <not><if-empty field-name="paymentMethodAndCreditCard"/></not> - <if-compare-field field-name="paymentMethodId" operator="not-equals" to-field-name="oldPaymentMethodId"/> - <if-compare-field field-name="paymentMethodAndCreditCard.cardType" operator="equals" to-field-name="serviceCtx.cardType"/> - <if-compare-field field-name="paymentMethodAndCreditCard.cardNumber" operator="equals" to-field-name="serviceCtx.cardNumber"/> + <not><if-empty field="paymentMethodAndCreditCard"/></not> + <if-compare-field field="paymentMethodId" to-field="oldPaymentMethodId" operator="not-equals"/> + <if-compare-field field="paymentMethodAndCreditCard.cardType" to-field="serviceCtx.cardType" operator="equals"/> + <if-compare-field field="paymentMethodAndCreditCard.cardNumber" to-field="serviceCtx.cardNumber" operator="equals"/> </assert> <check-errors/> </simple-method> @@ -376,10 +376,10 @@ <field field-name="hashType" type="java.lang.String"/> </call-class-method> <assert> - <not><if-empty field-name="partyAndUserLogin"/></not> - <if-compare-field field-name="partyAndUserLogin.currentPassword" operator="equals" to-field-name="newPasswordHash"/> - <if-compare-field field-name="partyAndUserLogin.userLoginId" operator="equals" to-field-name="userLoginId"/> + <not><if-empty field="partyAndUserLogin"/></not> + <if-compare-field field="partyAndUserLogin.currentPassword" to-field="newPasswordHash" operator="equals"/> + <if-compare-field field="partyAndUserLogin.userLoginId" to-field="userLoginId" operator="equals"/> </assert> <check-errors/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original) +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Fri Jun 13 23:03:12 2008 @@ -63,23 +63,23 @@ <set field="default_user_password" value="ungssblepsswd" /> <now-timestamp-to-env env-name="nowStamp"/> - <if-compare field-name="create_allow_password" operator="not-equals" value="true"> + <if-compare field="create_allow_password" operator="not-equals" value="true"> <set field="parameters.PASSWORD" from-field="default_user_password" /> <set field="parameters.CONFIRM_PASSWORD" from-field="default_user_password" /> <set field="parameters.PASSWORD_HINT" value="No hint set, accout not yet enabled" /> </if-compare> <!-- if username and/or password should be lowercased, do that now --> - <if-compare field-name="username_lowercase" operator="equals" value="true"> + <if-compare field="username_lowercase" operator="equals" value="true"> <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="USERNAME" ret-map-name="parameters"/> </if-compare> - <if-compare field-name="password_lowercase" operator="equals" value="true"> + <if-compare field="password_lowercase" operator="equals" value="true"> <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="PASSWORD" ret-map-name="parameters"/> <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="CONFIRM_PASSWORD" ret-map-name="parameters"/> </if-compare> <!-- Create the UserLogin Record --> - <if-not-empty field-name="USERNAME" map-name="parameters"> + <if-not-empty field="parameters.USERNAME"> <call-map-processor in-map-name="parameters" out-map-name="userLoginContext"> <simple-map-processor name="newUserLogin"> <process field="USERNAME"><copy to-field="userLoginId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyUserNameMissing"/></not-empty></process> @@ -92,10 +92,10 @@ <process field="PASSWORD_HINT"><copy to-field="passwordHint"/></process> </simple-map-processor> </call-map-processor> - <if-not-empty field-name="userLoginId" map-name="userLoginContext"> + <if-not-empty field="userLoginContext.userLoginId"> <set field="userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" /> <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-name="existingUserLogin"/> - <if-not-empty field-name="existingUserLogin"> + <if-not-empty field="existingUserLogin"> <set field="tempErrorMessage" value="Username in use, please choose another." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-not-empty> @@ -114,7 +114,7 @@ org.ofbiz.common.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale); ]]></call-bsh> <else> - <if-compare field-name="require_login" operator="equals" value="true"> + <if-compare field="require_login" operator="equals" value="true"> <add-error><fail-property resource="PartyUiLabels" property="PartyUserNameMissing"/></add-error> <check-errors/> </if-compare> @@ -138,7 +138,7 @@ <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId" /> <!-- Create the Postal Address --> - <if-compare field-name="USE_ADDRESS" map-name="parameters" operator="equals" value="false"> + <if-compare field="parameters.USE_ADDRESS" operator="equals" value="false"> <!-- address not used, do nothing --> <else> <call-map-processor in-map-name="parameters" out-map-name="addressContext"> @@ -159,14 +159,14 @@ <process field="USER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> </simple-map-processor> </call-map-processor> - <if-compare value="USA" operator="equals" field-name="USER_COUNTRY" map-name="parameters"> - <if-empty field-name="USER_STATE" map-name="parameters"> + <if-compare value="USA" operator="equals" field="parameters.USER_COUNTRY"> + <if-empty field="parameters.USER_STATE"> <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> - <if-compare value="CAN" operator="equals" field-name="USER_COUNTRY" map-name="parameters"> - <if-empty field-name="USER_STATE" map-name="parameters"> + <if-compare value="CAN" operator="equals" field="parameters.USER_COUNTRY"> + <if-empty field="parameters.USER_STATE"> <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> @@ -175,7 +175,7 @@ </if-compare> <!-- Create the Home Phone --> - <if-not-empty field-name="USER_HOME_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_HOME_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="homePhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -189,7 +189,7 @@ </if-not-empty> <!-- Create the Work Phone --> - <if-not-empty field-name="USER_WORK_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_WORK_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="workPhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -203,7 +203,7 @@ </if-not-empty> <!-- Create the Fax Phone --> - <if-not-empty field-name="USER_FAX_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_FAX_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="faxPhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -217,7 +217,7 @@ </if-not-empty> <!-- Create the Mobile Phone --> - <if-not-empty field-name="USER_MOBILE_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_MOBILE_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="mobilePhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -231,10 +231,10 @@ </if-not-empty> <!-- Check for required Phone --> - <if-compare field-name="require_phone" operator="equals" value="true"> - <if-empty field-name="USER_HOME_CONTACT" map-name="parameters"> - <if-empty field-name="USER_WORK_CONTACT" map-name="parameters"> - <if-empty field-name="USER_MOBILE_CONTACT" map-name="parameters"> + <if-compare field="require_phone" operator="equals" value="true"> + <if-empty field="parameters.USER_HOME_CONTACT"> + <if-empty field="parameters.USER_WORK_CONTACT"> + <if-empty field="parameters.USER_MOBILE_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="dummymap"> <simple-map-processor name="checkRequiredPhone"> <process field="REQUIRED_PHONE"> @@ -257,8 +257,8 @@ </call-map-processor> <!-- Check for required E-Mail --> - <if-compare field-name="require_email" operator="equals" value="true"> - <if-empty field-name="emailAddress" map-name="emailContext"> + <if-compare field="require_email" operator="equals" value="true"> + <if-empty field="emailContext.emailAddress"> <call-map-processor in-map-name="emailContext" out-map-name="dummymap"> <simple-map-processor name="checkRequiredEmail"> <process field="emailAddress"> @@ -267,7 +267,7 @@ </simple-map-processor> </call-map-processor> </if-empty> - <if-not-empty field-name="emailAddress" map-name="emailContext"> + <if-not-empty field="emailContext.emailAddress"> <call-map-processor in-map-name="emailContext" out-map-name="dummymap"> <simple-map-processor name="checkRequiredEmailFormat"> <process field="emailAddress"> @@ -308,7 +308,7 @@ <set field="mobilePhoneContext.partyId" from-field="tempMap.partyId" /> <set field="emailContext.partyId" from-field="tempMap.partyId" /> - <if-not-empty field-name="newUserLogin"> + <if-not-empty field="newUserLogin"> <!-- If password encryption is enabled, encrpyt it now --> <call-bsh><![CDATA[ boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security", "password.encrypt")); @@ -325,7 +325,7 @@ <call-service service-name="createPartyRole" in-map-name="partyRoleContext"/> <!-- shipping address --> - <if-compare field-name="USE_ADDRESS" map-name="parameters" operator="equals" value="false"> + <if-compare field="parameters.USE_ADDRESS" operator="equals" value="false"> <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> @@ -342,7 +342,7 @@ </if-compare> <!-- home phone --> - <if-not-empty field-name="USER_HOME_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> <result-to-field result-name="contactMechId" map-name="homePhonePurposeContext"/> </call-service> @@ -352,7 +352,7 @@ </if-not-empty> <!-- work phone --> - <if-not-empty field-name="USER_WORK_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> <result-to-field result-name="contactMechId" map-name="workPhonePurposeContext"/> </call-service> @@ -362,7 +362,7 @@ </if-not-empty> <!-- fax phone --> - <if-not-empty field-name="USER_FAX_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> <result-to-field result-name="contactMechId" map-name="faxPhonePurposeContext"/> </call-service> @@ -372,7 +372,7 @@ </if-not-empty> <!-- mobile phone --> - <if-not-empty field-name="USER_MOBILE_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.USER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> <result-to-field result-name="contactMechId" map-name="mobilePhonePurposeContext"/> </call-service> @@ -382,7 +382,7 @@ </if-not-empty> <!-- email address --> - <if-not-empty field-name="USER_EMAIL" map-name="parameters"> + <if-not-empty field="parameters.USER_EMAIL"> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> <result-to-field result-name="contactMechId" map-name="emailPurposeContext"/> </call-service> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Fri Jun 13 23:03:12 2008 @@ -24,7 +24,7 @@ <make-value value-name="newEntity" entity-name="ProdCatalog"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="parameters.prodCatalogId"> + <if-empty field="parameters.prodCatalogId"> <sequenced-id-to-env sequence-name="ProdCatalog" env-name="newEntity.prodCatalogId"/> <else> <set field="newEntity.prodCatalogId" from-field="parameters.prodCatalogId"/> @@ -49,7 +49,7 @@ <simple-method method-name="addProductCategoryToProdCatalog" short-description="Add Category To ProdCatalog"> <!-- Check that the ProductCategory exists --> <entity-one entity-name="ProductCategory" value-name="productCategory"/> - <if-empty field-name="productCategory"> + <if-empty field="productCategory"> <add-error><fail-property resource="ProductUiLabels" property="ProductCategoryNotFoundforCategoryID"/></add-error> </if-empty> <check-errors/> @@ -58,7 +58,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set from-field="nowTimestamp" field="newEntity.fromDate"/> </if-empty> @@ -87,7 +87,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -108,7 +108,7 @@ </simple-method> <simple-method method-name="getAllCategories" short-description="get All categories" login-required="false"> - <if-not-empty field-name="parameters.topCategory"> + <if-not-empty field="parameters.topCategory"> <set field="defaultTopCategoryId" from-field="parameters.topCategory"/> <else> <property-to-field property="top.category.default" field-name="defaultTopCategoryId" resource="catalog"/> @@ -133,28 +133,28 @@ <set field="productCategoryRollUpContext.parentProductCategoryId" from-field="parameters.parentProductCategoryId" /> <!--set field="categories" from-field="parameters.categories" / --> <find-by-and entity-name="ProductCategoryRollup" list-name="rollups" map-name="productCategoryRollUpContext" order-by-list-name="orderByStringList"/> - <if-not-empty field-name="parameters.categories"> + <if-not-empty field="parameters.categories"> <list-to-list list-name="parameters.categories" to-list-name="categories"/> </if-not-empty> - <if-not-empty field-name="rollups"> + <if-not-empty field="rollups"> <iterate list-name="rollups" entry-name="parent"> <get-related-one relation-name="CurrentProductCategory" value-name="parent" to-value-name="currentProductCategory"/> <field-to-list list-name="subCategories" field-name="currentProductCategory"/> </iterate> - <if-not-empty field-name="subCategories"> + <if-not-empty field="subCategories"> <set field="relatedCategoryContext.categories" from-field="subCategories"/> <iterate list-name="subCategories" entry-name="subCategory"> <set field="relatedCategoryContext.parentProductCategoryId" from-field="subCategory.productCategoryId"/> <call-service service-name="getRelatedCategories" in-map-name="relatedCategoryContext"> <result-to-field result-name="categories" field-name="relCategories"/> </call-service> - <if-not-empty field-name="relCategories"> - <if-not-empty field-name="categories"> + <if-not-empty field="relCategories"> + <if-not-empty field="categories"> <iterate list-name="relCategories" entry-name="relCategory"> <call-object-method obj-field-name="categories" method-name="contains" ret-field-name="addInCategories" > <field field-name="relCategory" type="java.lang.Object"/> </call-object-method> - <if-compare value="false" field-name="addInCategories" operator="equals" type="Boolean"> + <if-compare value="false" field="addInCategories" operator="equals" type="Boolean"> <field-to-list list-name="categories" field-name="relCategory"/> </if-compare> </iterate> @@ -189,7 +189,7 @@ <result-to-field result-name="categories" field-name="categories"/> </call-service> <!-- Get the category from categories--> - <if-not-empty field-name="categories"> + <if-not-empty field="categories"> <iterate list-name="categories" entry-name="category"> <set field="checkImageUrlForCategoryContext.categoryId" from-field="category.productCategoryId"/> <call-service service-name="checkImageUrlForCategoryAndProduct" in-map-name="checkImageUrlForCategoryContext"> @@ -211,31 +211,31 @@ <result-to-field result-name="category" field-name="category"/> </call-service> <!-- Get category images and check it exists or not --> - <if-not-empty field-name="category"> + <if-not-empty field="category"> <set field="checkImageUrlForCategoryContext.categoryId" from-field="category.productCategoryId"/> <call-service service-name="checkImageUrlForCategory" in-map-name="checkImageUrlForCategoryContext"> <result-to-field result-name="filesImageMap" field-name="filesImageMap"/> </call-service> - <if-not-empty field-name="categoryImageUrl" map-name="filesImageMap.categoryImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.categoryImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap.categoryImageUrlMap.categoryImageUrl"> + <if-compare value="Y" field="filesImageMap.categoryImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="categoryImageUrl" map-name="filesImageMap.categoryImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="categoryImageUrl" map-name="filesImageMap.categoryImageUrlMap"/> </else> </if-compare> </if-not-empty> - <if-not-empty field-name="linkOneImageUrl" map-name="filesImageMap.linkOneImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.linkOneImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap.linkOneImageUrlMap.linkOneImageUrl"> + <if-compare value="Y" field="filesImageMap.linkOneImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="linkOneImageUrl" map-name="filesImageMap.linkOneImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="linkOneImageUrl" map-name="filesImageMap.linkOneImageUrlMap"/> </else> </if-compare> </if-not-empty> - <if-not-empty field-name="linkTwoImageUrl" map-name="filesImageMap.linkTwoImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.linkTwoImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap.linkTwoImageUrlMap.linkTwoImageUrl"> + <if-compare value="Y" field="filesImageMap.linkTwoImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="linkTwoImageUrl" map-name="filesImageMap.linkTwoImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="linkTwoImageUrl" map-name="filesImageMap.linkTwoImageUrlMap"/> @@ -244,39 +244,39 @@ </if-not-empty> </if-not-empty> - <if-not-empty field-name="categoryMembers"> + <if-not-empty field="categoryMembers"> <iterate list-name="categoryMembers" entry-name="productCategoryMember"> <set field="checkImageUrlForProductContext.productId" from-field="productCategoryMember.productId"/> <call-service service-name="checkImageUrlForProduct" in-map-name="checkImageUrlForProductContext"> <result-to-field result-name="filesImageMap" field-name="filesImageMap"/> </call-service> - <if-not-empty field-name="filesImageMap"> - <if-not-empty field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.smallImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap"> + <if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl"> + <if-compare value="Y" field="filesImageMap.smallImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/> </else> </if-compare> </if-not-empty> - <if-not-empty field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.mediumImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap.mediumImageUrlMap.mediumImageUrl"> + <if-compare value="Y" field="filesImageMap.mediumImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/> </else> </if-compare> </if-not-empty> - <if-not-empty field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.largeImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap.largeImageUrlMap.largeImageUrl"> + <if-compare value="Y" field="filesImageMap.largeImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/> </else> </if-compare> </if-not-empty> - <if-not-empty field-name="detailImageUrl" map-name="filesImageMap.detailImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.detailImageUrl.isExists" operator="equals"> + <if-not-empty field="filesImageMap.detailImageUrlMap.detailImageUrl"> + <if-compare value="Y" field="filesImageMap.detailImageUrl.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/> <else> <field-to-list list-name="fileNotExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/> @@ -287,22 +287,22 @@ <!-- Case For virtual Product --> <!-- get related assoc product --> <get-related-one relation-name="Product" value-name="productCategoryMember" to-value-name="product"/> - <if-compare operator="equals" field-name="isVirtual" value="Y" map-name="product"> + <if-compare operator="equals" field="product.isVirtual" value="Y"> <!-- log level="info" message = "Virtual product =====${productCategoryMember.productId}"/ --> <set field="virtualProductContext.productId" from-field="product.productId"/> <set field="virtualProductContext.productAssocTypeId" value="PRODUCT_VARIANT"/> <find-by-and entity-name="ProductAssoc" map-name="virtualProductContext" list-name="variantProducts"/> <filter-list-by-date list-name="variantProducts"/> - <if-not-empty field-name="variantProducts"> + <if-not-empty field="variantProducts"> <iterate entry-name="variantProduct" list-name="variantProducts"> <!-- log level="info" message = "Variant product =====${variantProduct.productIdTo}"/ --> <set field="variantProductContext.productId" from-field="variantProduct.productIdTo"/> <call-service service-name="checkImageUrlForProduct" in-map-name="variantProductContext"> <result-to-field result-name="filesImageMap" field-name="filesImageMap"/> </call-service> - <if-not-empty field-name="filesImageMap"> - <if-not-empty field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.smallImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap"> + <if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl"> + <if-compare value="Y" field="filesImageMap.smallImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="smallImageUrl" map-name="filesImageMap.smallImageUrlMap"/> @@ -310,8 +310,8 @@ </if-compare> </if-not-empty> - <if-not-empty field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.mediumImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap.mediumImageUrlMap.mediumImageUrl"> + <if-compare value="Y" field="filesImageMap.mediumImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="mediumImageUrl" map-name="filesImageMap.mediumImageUrlMap"/> @@ -319,8 +319,8 @@ </if-compare> </if-not-empty> - <if-not-empty field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.largeImageUrlMap.isExists" operator="equals"> + <if-not-empty field="filesImageMap.largeImageUrlMap.largeImageUrl"> + <if-compare value="Y" field="filesImageMap.largeImageUrlMap.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/> <else> <field-to-list list-name="fileNotExists" field-name="largeImageUrl" map-name="filesImageMap.largeImageUrlMap"/> @@ -328,8 +328,8 @@ </if-compare> </if-not-empty> - <if-not-empty field-name="detailImageUrl" map-name="filesImageMap.detailImageUrlMap"> - <if-compare value="Y" field-name="filesImageMap.detailImageUrl.isExists" operator="equals"> + <if-not-empty field="filesImageMap.detailImageUrlMap.detailImageUrl"> + <if-compare value="Y" field="filesImageMap.detailImageUrl.isExists" operator="equals"> <field-to-list list-name="fileExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/> <else> <field-to-list list-name="fileNotExists" field-name="detailImageUrl" map-name="filesImageMap.detailImageUrl"/> @@ -350,11 +350,11 @@ <!-- This service get the category id and check all the images of category exists or not --> <simple-method method-name="checkImageUrlForCategory" short-description="Check for image url exists or not for product" login-required="false"> - <if-not-empty field-name="parameters.categoryId"> + <if-not-empty field="parameters.categoryId"> <set field="productCategoryFindContext.productCategoryId" from-field="parameters.categoryId"/> <find-by-primary-key entity-name="ProductCategory" value-name="category" map-name="productCategoryFindContext"/> <!-- check for category image url --> - <if-not-empty field-name="category.categoryImageUrl"> + <if-not-empty field="category.categoryImageUrl"> <set field="checkImageUrlContext.imageUrl" from-field="category.categoryImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> <result-to-field result-name="isExists" field-name="isExists"/> @@ -362,12 +362,12 @@ <set field="categoryImageUrlMap.categoryImageUrl" from-field="category.categoryImageUrl"/> <set field="categoryImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.categoryImageUrlMap" from-field="categoryImageUrlMap" /> - <if-compare value="N" field-name="isExists" operator="equals"> + <if-compare value="N" field="isExists" operator="equals"> <clear-field field-name="categoryImageUrl" map-name="category"></clear-field> </if-compare> </if-not-empty> <!-- check for link image url --> - <if-not-empty field-name="category.linkOneImageUrl"> + <if-not-empty field="category.linkOneImageUrl"> <clear-field field-name="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="category.linkOneImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> @@ -376,12 +376,12 @@ <set field="linkOneImageUrlMap.linkOneImageUrl" from-field="category.linkOneImageUrl"/> <set field="linkOneImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.linkOneImageUrlMap" from-field="linkOneImageUrlMap" /> - <if-compare value="N" field-name="isExists" operator="equals"> + <if-compare value="N" field="isExists" operator="equals"> <clear-field field-name="linkOneImageUrl" map-name="category"></clear-field> </if-compare> </if-not-empty> <!-- check for link two image url --> - <if-not-empty field-name="category.linkTwoImageUrl"> + <if-not-empty field="category.linkTwoImageUrl"> <clear-field field-name="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="category.linkTwoImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> @@ -390,7 +390,7 @@ <set field="linkTwoImageUrlMap.largeImageUrl" from-field="category.linkTwoImageUrl"/> <set field="linkTwoImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.linkTwoImageUrlMap" from-field="linkTwoImageUrlMap" /> - <if-compare value="N" field-name="isExists" operator="equals"> + <if-compare value="N" field="isExists" operator="equals"> <clear-field field-name="linkTwoImageUrl" map-name="category"></clear-field> </if-compare> </if-not-empty> @@ -401,11 +401,11 @@ </if-not-empty> </simple-method> <simple-method method-name="checkImageUrlForProduct" short-description="Check for image url exists or not for product" login-required="false"> - <if-not-empty field-name="parameters.productId"> + <if-not-empty field="parameters.productId"> <set field="productFindContext.productId" from-field="parameters.productId"/> <find-by-primary-key entity-name="Product" value-name="product" map-name="productFindContext"/> <!-- check for small image url --> - <if-not-empty field-name="product.smallImageUrl"> + <if-not-empty field="product.smallImageUrl"> <set field="checkImageUrlContext.imageUrl" from-field="product.smallImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> <result-to-field result-name="isExists" field-name="isExists"/> @@ -413,13 +413,13 @@ <set field="smallImageUrlMap.smallImageUrl" from-field="product.smallImageUrl"/> <set field="smallImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.smallImageUrlMap" from-field="smallImageUrlMap" /> - <if-compare value="N" field-name="isExists" operator="equals"> + <if-compare value="N" field="isExists" operator="equals"> <log level="info" message="Update SmallImage for product Id ${parameters.productId}" /> <clear-field field-name="smallImageUrl" map-name="product"></clear-field> </if-compare> </if-not-empty> <!-- check for medium image url --> - <if-not-empty field-name="product.mediumImageUrl"> + <if-not-empty field="product.mediumImageUrl"> <clear-field field-name="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="product.mediumImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> @@ -428,12 +428,12 @@ <set field="mediumImageUrlMap.mediumImageUrl" from-field="product.mediumImageUrl"/> <set field="mediumImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.mediumImageUrlMap" from-field="mediumImageUrlMap" /> - <if-compare value="N" field-name="isExists" operator="equals"> + <if-compare value="N" field="isExists" operator="equals"> <clear-field field-name="mediumImageUrl" map-name="product"></clear-field> </if-compare> </if-not-empty> <!-- check for large image url --> - <if-not-empty field-name="product.largeImageUrl"> + <if-not-empty field="product.largeImageUrl"> <clear-field field-name="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="product.largeImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> @@ -442,12 +442,12 @@ <set field="largeImageUrlMap.largeImageUrl" from-field="product.largeImageUrl"/> <set field="largeImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.largeImageUrlMap" from-field="largeImageUrlMap" /> - <if-compare value="N" field-name="isExists" operator="equals"> + <if-compare value="N" field="isExists" operator="equals"> <clear-field field-name="largeImageUrl" map-name="product"></clear-field> </if-compare> </if-not-empty> <!-- check for detail image url --> - <if-not-empty field-name="product.detailImageUrl"> + <if-not-empty field="product.detailImageUrl"> <clear-field field-name="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="product.detailImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> @@ -456,7 +456,7 @@ <set field="detailImageUrlMap.detailImageUrl" from-field="product.detailImageUrl"/> <set field="detailImageUrlMap.isExists" from-field="isExists"/> <set field="filesImageMap.detailImageUrlMap" from-field="detailImageUrlMap" /> - <if-compare value="N" field-name="isExists" operator="equals"> + <if-compare value="N" field="isExists" operator="equals"> <clear-field field-name="detailImageUrl" map-name="product"></clear-field> </if-compare> </if-not-empty> @@ -483,9 +483,9 @@ <if> <condition> <or> - <if-compare value="true" field-name="httpFlag" operator="equals" type="Boolean"/> - <if-compare value="true" field-name="httpsFlag" operator="equals" type="Boolean"/> - <if-compare value="true" field-name="ftpFlag" operator="equals" type="Boolean"/> + <if-compare value="true" field="httpFlag" operator="equals" type="Boolean"/> + <if-compare value="true" field="httpsFlag" operator="equals" type="Boolean"/> + <if-compare value="true" field="ftpFlag" operator="equals" type="Boolean"/> </or> </condition> <then> @@ -500,7 +500,7 @@ </call-class-method> </else> </if> - <if-not-empty field-name="url" > + <if-not-empty field="url"> <set field="isExists" value="Y"/> <else> <set field="isExists" value="N"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Fri Jun 13 23:03:12 2008 @@ -26,7 +26,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Fri Jun 13 23:03:12 2008 @@ -36,7 +36,7 @@ <make-value value-name="newEntity" entity-name="ProductCategory"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="parameters.productCategoryId"> + <if-empty field="parameters.productCategoryId"> <sequenced-id-to-env sequence-name="ProductCategory" env-name="newEntity.productCategoryId"/> <else> <set field="newEntity.productCategoryId" from-field="parameters.productCategoryId"/> @@ -50,7 +50,7 @@ <!-- if setting the primaryParentCategoryId, create a rollup entity too --> <!-- NOTE: this is commented out to disable because it is dangerous to add category rollups on a live site without being able to specify a fromDate - <if-not-empty field-name="primaryParentCategoryId" map-name="newEntity"> + <if-not-empty field="newEntity.primaryParentCategoryId"> <make-value entity-name="ProductCategoryRollup" value-name="newRollup"/> <field-to-field field-name="productCategoryId" map-name="newEntity" to-field-name="productCategoryId" to-map-name="newRollup"/> <field-to-field field-name="primaryParentCategoryId" map-name="newEntity" to-field-name="parentProductCategoryId" to-map-name="newRollup"/> @@ -89,8 +89,8 @@ <!-- if setting the primaryParentCategoryId, create a rollup entity too --> <!-- NOTE: this is commented out to disable because it is dangerous to add category rollups on a live site without being able to specify a fromDate - <if-not-empty field-name="primaryParentCategoryId" map-name="lookedUpValue"> - <if-compare-field field-name="primaryParentCategoryId" map-name="lookedUpValue" operator="not-equals" to-map-name="saveIdMap"> + <if-not-empty field="lookedUpValue.primaryParentCategoryId"> + <if-compare-field to-field="saveIdMap." field="lookedUpValue.primaryParentCategoryId" operator="not-equals"> <make-value entity-name="ProductCategoryRollup" value-name="newRollup"/> <field-to-field field-name="productCategoryId" map-name="lookedUpValue" to-field-name="productCategoryId" to-map-name="newRollup"/> <field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-field-name="parentProductCategoryId" to-map-name="newRollup"/> @@ -119,7 +119,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -144,7 +144,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -164,7 +164,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -201,7 +201,7 @@ <!-- If the associated category was the primary category for the product, clear that field --> <entity-one entity-name="Product" value-name="product" auto-field-map="true"/> - <if-compare-field field-name="product.primaryProductCategoryId" operator="equals" to-field-name="parameters.productCategoryId"> + <if-compare-field field="product.primaryProductCategoryId" to-field="parameters.productCategoryId" operator="equals"> <clear-field field-name="product.primaryProductCategoryId"/> <store-value value-name="product"/> </if-compare-field> @@ -226,7 +226,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -272,7 +272,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -293,7 +293,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -312,7 +312,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -365,7 +365,7 @@ </entity-and> <set field="validDate" from-field="parameters.validDate"/> - <if-not-empty field-name="validDate"> + <if-not-empty field="validDate"> <filter-list-by-date list-name="productCategoryMembers" valid-date-name="validDate"/> </if-not-empty> @@ -377,12 +377,12 @@ </iterate> <store-list list-name="pcmsToStore"/> - <if-compare field-name="recurse" map-name="parameters" operator="equals" value="Y"> + <if-compare field="parameters.recurse" operator="equals" value="Y"> <!-- call this service for each sub-category in the rollup with the same productCategoryIdTo --> <set field="lookupChildrenMap.parentProductCategoryId" from-field="parameters.productCategoryId"/> <find-by-and entity-name="ProductCategoryRollup" map-name="lookupChildrenMap" list-name="productCategoryRollups"/> - <if-not-empty field-name="validDate"> + <if-not-empty field="validDate"> <filter-list-by-date list-name="productCategoryRollups" valid-date-name="validDate"/> </if-not-empty> @@ -417,7 +417,7 @@ <field-map field-name="productCategoryId" env-name="productCategoryId"/> </entity-and> - <if-not-empty field-name="validDate"> + <if-not-empty field="validDate"> <filter-list-by-date list-name="categoryEntities" valid-date-name="validDate"/> </if-not-empty> @@ -436,7 +436,7 @@ <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <if-not-empty field-name="parameters.thruDate"> + <if-not-empty field="parameters.thruDate"> <set field="expireTimestamp" from-field="parameters.thruDate"/> <else> <now-timestamp-to-env env-name="expireTimestamp"/> @@ -458,7 +458,7 @@ <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <if-not-empty field-name="parameters.validDate"> + <if-not-empty field="parameters.validDate"> <set field="expireTimestamp" from-field="parameters.validDate"/> <else> <now-timestamp-to-env env-name="expireTimestamp"/> @@ -470,7 +470,7 @@ </entity-and> <iterate entry-name="productCategoryMember" list-name="productCategoryMembers"> - <if-compare-field field-name="thruDate" map-name="productCategoryMember" operator="less" to-field-name="expireTimestamp" type="Timestamp"> + <if-compare-field field="productCategoryMember.thruDate" to-field="expireTimestamp" operator="less" type="Timestamp"> <remove-value value-name="productCategoryMember"/> </if-compare-field> </iterate> @@ -485,14 +485,14 @@ <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <if-empty field-name="parameters.currencyUomId"> + <if-empty field="parameters.currencyUomId"> <!-- default to USD for lack of a better alternative, for now anyway... --> <set field="parameters.currencyUomId" value="USD"/> </if-empty> <!-- create Product --> <set-service-fields service-name="createProduct" map-name="parameters" to-map-name="callCreateProductMap"/> - <if-empty field-name="callCreateProductMap.productTypeId"> + <if-empty field="callCreateProductMap.productTypeId"> <set field="callCreateProductMap.productTypeId" value="FINISHED_GOOD"/> </if-empty> <call-service service-name="createProduct" in-map-name="callCreateProductMap"> @@ -506,7 +506,7 @@ <call-service service-name="addProductToCategory" in-map-name="callCreateProductCategoryMemberMap"/> <!-- create defaultPrice and averageCost ProductPrice --> - <if-not-empty field-name="parameters.defaultPrice"> + <if-not-empty field="parameters.defaultPrice"> <set field="createDefaultPriceMap.productId" from-field="productId"/> <set field="createDefaultPriceMap.currencyUomId" from-field="parameters.currencyUomId"/> <set field="createDefaultPriceMap.price" from-field="parameters.defaultPrice"/> @@ -516,7 +516,7 @@ <call-service service-name="createProductPrice" in-map-name="createDefaultPriceMap"/> </if-not-empty> - <if-not-empty field-name="parameters.averageCost"> + <if-not-empty field="parameters.averageCost"> <set field="createAverageCostMap.productId" from-field="productId"/> <set field="createAverageCostMap.currencyUomId" from-field="parameters.currencyUomId"/> <set field="createAverageCostMap.price" from-field="parameters.averageCost"/> @@ -532,7 +532,7 @@ <log level="info" message="Applying feature [${productFeatureId}] of type [${productFeatureTypeId}] to product [${productId}]"/> <set field="createPfaMap.productId" from-field="productId"/> <set field="createPfaMap.productFeatureId" from-field="productFeatureId"/> - <if-compare field-name="${productFeatureTypeId}" map-name="parameters.productFeatureSelectableByType" operator="equals" value="Y"> + <if-compare field="parameters.productFeatureSelectableByType.${productFeatureTypeId}" operator="equals" value="Y"> <set field="createPfaMap.productFeatureApplTypeId" value="SELECTABLE_FEATURE"/> <set field="hasSelectableFeatures" value="Y"/> <else> @@ -544,7 +544,7 @@ </iterate-map> <!-- set isVirtual based on hasSelectableFeatures --> - <if-compare field-name="hasSelectableFeatures" operator="equals" value="Y"> + <if-compare field="hasSelectableFeatures" operator="equals" value="Y"> <entity-one entity-name="Product" value-name="newProduct"/> <set field="newProduct.isVirtual" value="Y"/> <store-value value-name="newProduct"/> @@ -572,27 +572,27 @@ <set field="productCategoryIdTo" from-field="parameters.productCategoryId"/> <!-- if requested, duplicate related data as well --> - <if-not-empty field-name="duplicateMembers" map-name="parameters"> + <if-not-empty field="parameters.duplicateMembers"> <set field="entityName" value="ProductCategoryMember"/> <call-simple-method method-name="copyCategoryEntities"/> </if-not-empty> - <if-not-empty field-name="duplicateContent" map-name="parameters"> + <if-not-empty field="parameters.duplicateContent"> <set field="entityName" value="ProductCategoryContent"/> <call-simple-method method-name="copyCategoryEntities"/> </if-not-empty> - <if-not-empty field-name="duplicateRoles" map-name="parameters"> + <if-not-empty field="parameters.duplicateRoles"> <set field="entityName" value="ProductCategoryRole"/> <call-simple-method method-name="copyCategoryEntities"/> </if-not-empty> - <if-not-empty field-name="duplicateAttributes" map-name="parameters"> + <if-not-empty field="parameters.duplicateAttributes"> <set field="entityName" value="ProductCategoryAttribute"/> <call-simple-method method-name="copyCategoryEntities"/> </if-not-empty> - <if-not-empty field-name="duplicateFeatures" map-name="parameters"> + <if-not-empty field="parameters.duplicateFeatures"> <set field="entityName" value="ProductFeatureCategoryAppl"/> <call-simple-method method-name="copyCategoryEntities"/> </if-not-empty> - <if-not-empty field-name="duplicateCatalogs" map-name="parameters"> + <if-not-empty field="parameters.duplicateCatalogs"> <set field="entityName" value="ProdCatalogCategory"/> <call-simple-method method-name="copyCategoryEntities"/> </if-not-empty> @@ -600,7 +600,7 @@ <!-- parent rollups are where oldProductCategoryId = ProductCategoryRollup.productCategoryId, but the child roll up is where oldProductCategoryId = ProductCategoryRollup.parentProductCategoryId and hence requires a new find-by map --> - <if-not-empty field-name="duplicateParentRollup" map-name="parameters"> + <if-not-empty field="parameters.duplicateParentRollup"> <find-by-and entity-name="ProductCategoryRollup" map-name="categoryFindContext" list-name="foundValues"/> <iterate entry-name="foundValue" list-name="foundValues"> <clone-value value-name="foundValue" new-value-name="newTempValue"/> @@ -608,7 +608,7 @@ <create-value value-name="newTempValue"/> </iterate> </if-not-empty> - <if-not-empty field-name="duplicateChildRollup" map-name="parameters"> + <if-not-empty field="parameters.duplicateChildRollup"> <entity-and entity-name="ProductCategoryRollup" list-name="foundValues"> <field-map field-name="parentProductCategoryId" env-name="parameters.oldProductCategoryId"/> </entity-and> @@ -670,14 +670,14 @@ <set field="newEntity.productCategoryId" from-field="parameters.productCategoryId"/> <!-- don't set the fromDate yet; let's get the seq ID first --> - <if-empty field-name="parameters.linkSeqId"> + <if-empty field="parameters.linkSeqId"> <make-next-seq-id value-name="newEntity" seq-field-name="linkSeqId"/> <!-- this finds the next sub-sequence ID --> <set from-field="linkSeqId" field="newEntity.linkSeqId"/> </if-empty> <!-- now set the rest of the PK fields (should just be fromDate now; unless linkSeqId is not empty --> <set-pk-fields value-name="newEntity" map-name="parameters"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="newEntity.fromDate"/> </if-empty> @@ -703,16 +703,16 @@ <!-- a methods to centralize product security code, meant to be called in-line with call-simple-method, and the checkAction and callingMethodName attributes should be in the method context --> <simple-method method-name="checkCategoryRelatedPermission" short-description="Check Product Category Related Permission"> - <if-empty field-name="callingMethodName"> + <if-empty field="callingMethodName"> <set field="callingMethodName" value="this operation"/> </if-empty> - <if-empty field-name="checkAction"> + <if-empty field="checkAction"> <set field="checkAction" value="UPDATE"/> </if-empty> - <if-empty field-name="productCategoryIdName"> + <if-empty field="productCategoryIdName"> <set field="productCategoryIdName" value="productCategoryId"/> </if-empty> - <if-empty field-name="productCategoryIdToCheck"> + <if-empty field="productCategoryIdToCheck"> <set field="productCategoryIdToCheck" from-field="parameters.${productCategoryIdName}"/> </if-empty> @@ -739,7 +739,7 @@ <if-has-permission permission="CATALOG" action="_${checkAction}"/> <and> <if-has-permission permission="CATALOG_ROLE" action="_${checkAction}"/> - <not><if-empty field-name="roleCategories"/></not> + <not><if-empty field="roleCategories"/></not> </and> </or> </not> @@ -753,7 +753,7 @@ </simple-method> <simple-method method-name="productCategoryGenericPermission" short-description="Main permission logic"> <set field="mainAction" from-field="parameters.mainAction"/> - <if-empty field-name="mainAction"> + <if-empty field="mainAction"> <add-error><fail-message message="In the permission-service element for the productGenericPermission service the main-action attribute was missing but is required"/></add-error> <check-errors/> </if-empty> @@ -762,7 +762,7 @@ <set field="checkAction" from-field="parameters.mainAction"/> <call-simple-method method-name="checkCategoryRelatedPermission"/> - <if-empty field-name="error_list"> + <if-empty field="error_list"> <set field="hasPermission" type="Boolean" value="true"/> <field-to-result field-name="hasPermission"/> @@ -781,7 +781,7 @@ <call-service service-name="productCategoryGenericPermission" in-map-name="productCategoryGenericPermissionMap"> <results-to-map map-name="genericResult"/> </call-service> - <if-compare field-name="genericResult.hasPermission" operator="equals" value="false" type="Boolean"> + <if-compare field="genericResult.hasPermission" operator="equals" value="false" type="Boolean"> <field-to-result field-name="genericResult.hasPermission" result-name="hasPermission"/> <field-to-result field-name="genericResult.failMessage" map-name="failMessage"/> <return/> @@ -811,7 +811,7 @@ <if> <condition> <and> - <if-compare field-name="prodCatalog.viewAllowPermReqd" operator="equals" value="Y"/> + <if-compare field="prodCatalog.viewAllowPermReqd" operator="equals" value="Y"/> <not><if-has-permission permission="CATALOG_VIEW_ALLOW"/></not> </and> </condition> @@ -824,7 +824,7 @@ <if> <condition> <and> - <if-compare field-name="prodCatalog.purchaseAllowPermReqd" operator="equals" value="Y"/> + <if-compare field="prodCatalog.purchaseAllowPermReqd" operator="equals" value="Y"/> <not><if-has-permission permission="CATALOG_PURCHASE_ALLOW"/></not> </and> </condition> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Fri Jun 13 23:03:12 2008 @@ -34,7 +34,7 @@ <now-timestamp-to-env env-name="nowTimestamp"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> <field-to-result field-name="fromDate" map-name="newEntity"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Fri Jun 13 23:03:12 2008 @@ -26,7 +26,7 @@ <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="fromDate" map-name="newEntity"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimestamp"/> <set field="newEntity.fromDate" from-field="nowTimestamp" /> </if-empty> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |