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

Merge df64591a59d3

This commit is contained in:
Heng Sin Low 2013-04-05 09:53:41 +08:00
parent a0e9c93f02 e14cfc212a
commit 6ce3aa387b
1 changed files with 23 additions and 17 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

@ -1384,14 +1384,17 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
String sqlquery = "SELECT * FROM " + tableName; String sqlquery = "SELECT * FROM " + tableName;
sqlquery = role.addAccessSQL(sqlquery, tableName, true, true); sqlquery = role.addAccessSQL(sqlquery, tableName, true, true);
for (DataField field : modelCRUD.getDataRow().getFieldArray()) { if (modelCRUD.getDataRow() != null)
if (m_webservicetype.isInputColumnNameAllowed(field.getColumn())) { {
sqlquery += " AND " + field.getColumn() + "=?"; for (DataField field : modelCRUD.getDataRow().getFieldArray()) {
} else { if (m_webservicetype.isInputColumnNameAllowed(field.getColumn())) {
throw new IdempiereServiceFault("Web service type " sqlquery += " AND " + field.getColumn() + "=?";
+ m_webservicetype.getValue() + ": input column " } else {
+ field.getColumn() + " not allowed", new QName("queryData")); throw new IdempiereServiceFault("Web service type "
} + m_webservicetype.getValue() + ": input column "
+ field.getColumn() + " not allowed", new QName("queryData"));
}
}
} }
if (modelCRUD.getFilter() != null && modelCRUD.getFilter().length() > 0) if (modelCRUD.getFilter() != null && modelCRUD.getFilter().length() > 0)
@ -1406,15 +1409,18 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
{ {
pstmtquery = DB.prepareStatement (sqlquery, null); pstmtquery = DB.prepareStatement (sqlquery, null);
int p = 1; int p = 1;
for (DataField field : modelCRUD.getDataRow().getFieldArray()) { if (modelCRUD.getDataRow() != null)
int idx = poinfo.getColumnIndex(field.getColumn()); {
Class<?> c = poinfo.getColumnClass(idx); for (DataField field : modelCRUD.getDataRow().getFieldArray()) {
if (c == Integer.class) int idx = poinfo.getColumnIndex(field.getColumn());
pstmtquery.setInt(p++, Integer.valueOf(field.getVal())); Class<?> c = poinfo.getColumnClass(idx);
else if (c == Timestamp.class) if (c == Integer.class)
pstmtquery.setTimestamp(p++, Timestamp.valueOf(field.getVal())); pstmtquery.setInt(p++, Integer.valueOf(field.getVal()));
else if (c == Boolean.class || c == String.class) else if (c == Timestamp.class)
pstmtquery.setString(p++, field.getVal()); pstmtquery.setTimestamp(p++, Timestamp.valueOf(field.getVal()));
else if (c == Boolean.class || c == String.class)
pstmtquery.setString(p++, field.getVal());
}
} }
rsquery = pstmtquery.executeQuery (); rsquery = pstmtquery.executeQuery ();
// Angelo Dabala' (genied) must create just one DataSet, moved outside of the while loop // Angelo Dabala' (genied) must create just one DataSet, moved outside of the while loop