Skip to content

Commit ee06b4d

Browse files
BroadleafCommerce/QA#1508 - Don't replace MVEL expressions for the pricing context attributes since they are already Map<String, String>
1 parent 0269fed commit ee06b4d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

common/src/main/java/org/broadleafcommerce/common/rule/MvelHelper.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,20 @@ protected static String modifyExpression(String rule, Map<String, Object> rulePa
208208
return modifiedExpression;
209209
}
210210

211+
/**
212+
* Returns an array of attribute map field names that we need to do replacements for in
213+
* {@link #modifyExpression(String, Map, ParserContext)}
214+
*/
211215
protected static String[] getRuleAttributeMaps() {
216+
// intentionally left out pricing context getPricingContextAttributes because that's a Map<String, String>
212217
return new String[]{ "getProductAttributes",
213218
"getCategoryAttributesMap",
214219
"getSkuAttributes",
215220
"getOrderItemAttributes",
216221
"getCustomerAttributes",
217-
"getPricingContextAttributes",
222+
// Map<String, PageAttribute>
218223
"getAdditionalAttributes",
224+
// Map<String, AdminUserAttribute>
219225
"getAdditionalFields"};
220226
}
221227

0 commit comments

Comments
 (0)