midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2544 Integrate/peer review patch IDEMPIERE-2544-containFunction.patch provided by Hiep Lq

This commit is contained in:
Carlos Ruiz 2017-12-03 14:13:52 +01:00
parent 7184f1c80e
commit 5044414ae4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/src/org/compiere/model/ModelValidationEngine.java
View File

@ -621,7 +621,7 @@ public class ModelValidationEngine
return; return;
// //
String propertyName = String propertyName =
m_globalValidators.contains(listener) (listener instanceof ModelValidator && m_globalValidators.contains((ModelValidator)listener))
? tableName + "*" ? tableName + "*"
: tableName + listener.getAD_Client_ID(); : tableName + listener.getAD_Client_ID();
ArrayList<FactsValidator> list = m_factsValidateListeners.get(propertyName); ArrayList<FactsValidator> list = m_factsValidateListeners.get(propertyName);
@ -666,7 +666,7 @@ public class ModelValidationEngine
if (tableName == null || listener == null) if (tableName == null || listener == null)
return; return;
String propertyName = String propertyName =
m_globalValidators.contains(listener) (listener instanceof ModelValidator && m_globalValidators.contains((ModelValidator)listener))
? tableName + "*" ? tableName + "*"
: tableName + listener.getAD_Client_ID(); : tableName + listener.getAD_Client_ID();
ArrayList<FactsValidator> list = m_factsValidateListeners.get(propertyName); ArrayList<FactsValidator> list = m_factsValidateListeners.get(propertyName);
@ -733,7 +733,7 @@ public class ModelValidationEngine
{ {
validator = list.get(i); validator = list.get(i);
if (validator.getAD_Client_ID() == po.getAD_Client_ID() if (validator.getAD_Client_ID() == po.getAD_Client_ID()
|| m_globalValidators.contains(validator)) || (validator instanceof ModelValidator && m_globalValidators.contains((ModelValidator)validator)))
{ {
String error = validator.factsValidate(schema, facts, po); String error = validator.factsValidate(schema, facts, po);
if (error != null && error.length() > 0) if (error != null && error.length() > 0)