You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/01/26 11:44:21 UTC
svn commit: r1438876 -
/ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl
Author: jleroux
Date: Sat Jan 26 10:44:21 2013
New Revision: 1438876
URL: http://svn.apache.org/viewvc?rev=1438876&view=rev
Log:
A patch from Taher Alkhateeb for "Corrections and improvements to dependent drop-downs" https://issues.apache.org/jira/browse/OFBIZ-5126
* The getDependentDropdownValues function in miscAjaxFunctions.js is modified with a new argument to allow for empty selections. Therefore, copying the behavior of form widget drop-down's "allow-empty"
* There is only one file affected by item number 2 above: setPriceRulesCondEventJs.ftl Therefore, I fixed it to include the argument in getDependentDropdownValues
jleroux: complete r1438501 where I missed setPriceRulesCondEventJs.ftl, as suggested Taher, for consistency sake, I used '' instead of false
Modified:
ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl
Modified: ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl?rev=1438876&r1=1438875&r2=1438876&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl Sat Jan 26 10:44:21 2013
@@ -23,18 +23,18 @@ jQuery(document).ready( function() {
if (document.getElementById('EditProductPriceRulesCond_o_${i}')) {
jQuery('#EditProductPriceRulesCond_condValueInput_o_${i}').hide();
jQuery('#EditProductPriceRulesCond_inputParamEnumId_o_${i}').change( function() {
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
});
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
}
</#list>
</#if>
if (document.getElementById('AddProductPriceRulesCond_o_0')) {
jQuery('#AddProductPriceRulesCond_condValueInput_o_0').hide();
jQuery('#AddProductPriceRulesCond_inputParamEnumId_o_0').change( function() {
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'AddProductPriceRulesCond_inputParamEnumId_o_0', 'AddProductPriceRulesCond_condValue_o_0', 'productPriceRulesCondValues', 'condValue_o_0', 'description', '', '', '', '', 'AddProductPriceRulesCond_condValueInput_o_0');
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'AddProductPriceRulesCond_inputParamEnumId_o_0', 'AddProductPriceRulesCond_condValue_o_0', 'productPriceRulesCondValues', 'condValue_o_0', 'description', '', '', '', '', '', 'AddProductPriceRulesCond_condValueInput_o_0');
});
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'AddProductPriceRulesCond_inputParamEnumId_o_0', 'AddProductPriceRulesCond_condValue_o_0', 'productPriceRulesCondValues', 'condValue_o_0', 'description', '', '', '', '', 'AddProductPriceRulesCond_condValueInput_o_0');
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'AddProductPriceRulesCond_inputParamEnumId_o_0', 'AddProductPriceRulesCond_condValue_o_0', 'productPriceRulesCondValues', 'condValue_o_0', 'description', '', '', '', '', '', 'AddProductPriceRulesCond_condValueInput_o_0');
}
})
</script>