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

IDEMPIERE-460: Fixing regression issue with lookup on web service

This commit is contained in:
Deepak Pansheriya 2013-07-17 14:52:11 +05:30
parent c5211d7bf3
commit 89ff83536f
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java
View File

@ -45,6 +45,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.xmlbeans.StringEnumAbstractBase.Table; import org.apache.xmlbeans.StringEnumAbstractBase.Table;
import org.compiere.model.Lookup; import org.compiere.model.Lookup;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory; import org.compiere.model.MLookupFactory;
import org.compiere.model.MRefTable; import org.compiere.model.MRefTable;
import org.compiere.model.MRole; import org.compiere.model.MRole;
@ -57,7 +58,9 @@ import org.compiere.model.X_WS_WebServiceFieldInput;
import org.compiere.model.X_WS_WebService_Para; import org.compiere.model.X_WS_WebService_Para;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Trx; import org.compiere.util.Trx;
import org.compiere.util.Util; import org.compiere.util.Util;
import org.compiere.util.ValueNamePair; import org.compiere.util.ValueNamePair;
@ -1071,11 +1074,38 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
"LookupResolutionFailed")); "LookupResolutionFailed"));
} }
String sql = ADLookup.getDirectAccessSQL(lookup, lookupValue.toUpperCase()); int AD_Reference_ID = 0;
int id = DB.getSQLValue(localTrxName, sql); if(lookup instanceof MLookup){
if (id > 0) AD_Reference_ID = ((MLookup)lookup).getDisplayType();
value = id; }
if(AD_Reference_ID==DisplayType.List)
{
if (lookup.getSize() == 0)
lookup.refresh();
Object[] list = lookup.getData(true, true, true, false,false).toArray(); // IDEMPIERE 90
for (Object pair : list) {
if (pair instanceof KeyNamePair) {
KeyNamePair p = (KeyNamePair) pair;
if (p.getName().equalsIgnoreCase(lookupValue)) {
value = p.getID();
break;
}
} else {
ValueNamePair p = (ValueNamePair) pair;
if (p.getName().equalsIgnoreCase(lookupValue)) {
value = p.getValue();
break;
}
}
}
}else{
String sql = ADLookup.getDirectAccessSQL(lookup, lookupValue.toUpperCase());
int id = DB.getSQLValue(localTrxName, sql);
if (id > 0)
value = id;
}
if (value == null) { if (value == null) {
throw new IdempiereServiceFault(" Invalid Lookup value:" + lookupValue, new QName("LookupResolutionFailed")); throw new IdempiereServiceFault(" Invalid Lookup value:" + lookupValue, new QName("LookupResolutionFailed"));
} }