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

IDEMPIERE-4472 Window Advanced Search - Allow select column from window tabs - 2pack compatibility (#983) 

Fix NPE
This commit is contained in:
hengsin 2021-11-16 18:25:21 +08:00 committed by GitHub
parent 33541ce204
commit d461b430d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -1054,7 +1054,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
listTable.setInstantSelect(false); listTable.setInstantSelect(false);
listTable.addEventListener(Events.ON_BLUR, e -> { listTable.addEventListener(Events.ON_BLUR, e -> {
if (listTable.getSelectedItem() == null) { if (listTable.getSelectedItem() == null) {
listTable.setValue(null); listTable.setSelectedIndex(0);
} }
}); });
@ -1648,7 +1648,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
{ {
Comboitem table = listTable.getSelectedItem(); Comboitem table = listTable.getSelectedItem();
//Attribute //Attribute
if (table.getValue().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) { if (table != null && table.getValue().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) {
setAttributes(listColumn, listOperator, null); setAttributes(listColumn, listOperator, null);
} else { } else {
if (table != null && table.getValue().toString().length() > 0) if (table != null && table.getValue().toString().length() > 0)
@ -1668,7 +1668,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
Comboitem table = listTable.getSelectedItem(); Comboitem table = listTable.getSelectedItem();
//Attribute //Attribute
if (table.getValue().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) { if (table != null && table.getValue().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) {
if (listbox.getId().equals(listColumn.getId())) if (listbox.getId().equals(listColumn.getId()))
{ {
Comboitem column = listColumn.getSelectedItem(); Comboitem column = listColumn.getSelectedItem();
@ -1702,7 +1702,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
// Attribute // Attribute
Comboitem table = listTable.getSelectedItem(); Comboitem table = listTable.getSelectedItem();
if (table.getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) { if (table != null && table.getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) {
Component componentFrom = getAttributeValuesListComponent(row, false); Component componentFrom = getAttributeValuesListComponent(row, false);
componentFrom.setId("searchFieldFrom"+row.getId()); componentFrom.setId("searchFieldFrom"+row.getId());
@ -2082,8 +2082,8 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
boolean isExistCondition = false; boolean isExistCondition = false;
boolean isRightBracketCompositeExists = false; boolean isRightBracketCompositeExists = false;
if(!table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) { if(table.getSelectedItem() != null && !table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) {
if (table != null && !table.getSelectedItem().getValue().toString().isEmpty()) if (!table.getSelectedItem().getValue().toString().isEmpty())
{ {
m_gridTab=m_windowPanel.getGridWindow().getGridTab(table.getSelectedItem().getValue()); m_gridTab=m_windowPanel.getGridWindow().getGridTab(table.getSelectedItem().getValue());
} }
@ -2103,14 +2103,14 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
} }
ValueNamePair vnp = column.getSelectedItem().getValue(); ValueNamePair vnp = column.getSelectedItem().getValue();
String ColumnName = vnp.getValue(); String ColumnName = vnp.getValue();
String TableName = table.getSelectedItem().getValue().toString(); String tableUID = table.getSelectedItem() != null ? table.getSelectedItem().getValue().toString() : "";
String infoName = column.toString(); String infoName = column.toString();
GridField field = null; GridField field = null;
boolean isProductCategoryField = false; boolean isProductCategoryField = false;
String ColumnSQL = null; String ColumnSQL = null;
if (table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) { if (table.getSelectedItem() != null && table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) {
ColumnSQL = getAttributeSQL(Integer.valueOf(ColumnName)); ColumnSQL = getAttributeSQL(Integer.valueOf(ColumnName));
} else { } else {
// //
@ -2119,7 +2119,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
continue; continue;
isProductCategoryField = isProductCategoryField(field.getColumnName()); isProductCategoryField = isProductCategoryField(field.getColumnName());
ColumnSQL = field.getColumnSQL(false); ColumnSQL = field.getColumnSQL(false);
if (!table.getSelectedItem().getValue().equals(m_AD_Tab_UU)) if (table.getSelectedItem() != null && !table.getSelectedItem().getValue().equals(m_AD_Tab_UU))
{ {
if (!isCompositeExists) { if (!isCompositeExists) {
exists ="SELECT 1 FROM "+m_gridTab.getTableName()+" WHERE "+m_gridTab.getTableName()+"."+m_gridTab.getLinkColumnName()+" = "+m_tableName+"."+m_tableName+"_ID ";// "+tab.getTableName()+"."; exists ="SELECT 1 FROM "+m_gridTab.getTableName()+" WHERE "+m_gridTab.getTableName()+"."+m_gridTab.getLinkColumnName()+" = "+m_tableName+"."+m_tableName+"_ID ";// "+tab.getTableName()+".";
@ -2212,13 +2212,13 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
m_query.addRestriction(ColumnSQL, Operator, null, m_query.addRestriction(ColumnSQL, Operator, null,
infoName, null, andOr, openBrackets); infoName, null, andOr, openBrackets);
} }
appendCode(code, ColumnName, Operator, "", "", andOr, lBrackets, rBrackets, TableName); appendCode(code, ColumnName, Operator, "", "", andOr, lBrackets, rBrackets, tableUID);
} }
continue; continue;
} }
Object parsedValue = null; Object parsedValue = null;
//Parse AttributeValue //Parse AttributeValue
if (table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) if (table.getSelectedItem() != null && table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID))
parsedValue = parseAttributeValue(Integer.valueOf(ColumnName), value); parsedValue = parseAttributeValue(Integer.valueOf(ColumnName), value);
else else
parsedValue = parseValue(field, value); parsedValue = parseValue(field, value);
@ -2226,7 +2226,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
continue; continue;
String infoDisplay = (value == null ? "" : value.toString()); String infoDisplay = (value == null ? "" : value.toString());
// When Atribute is set Field is null // When Atribute is set Field is null
if(!table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) if(table.getSelectedItem() != null && !table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID))
{ {
if (field.isLookup()) if (field.isLookup())
infoDisplay = field.getLookup().getDisplay(value); infoDisplay = field.getLookup().getDisplay(value);
@ -2261,14 +2261,14 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
continue; continue;
Object parsedValue2 = null; Object parsedValue2 = null;
//Parse Attribute Value 2 by field/Attribute //Parse Attribute Value 2 by field/Attribute
if (table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)) if (table.getSelectedItem() != null && table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID))
parsedValue2 = parseAttributeValue(Integer.valueOf(ColumnName), value2); parsedValue2 = parseAttributeValue(Integer.valueOf(ColumnName), value2);
else else
parsedValue2 = parseValue(field, value2); parsedValue2 = parseValue(field, value2);
String infoDisplay_to = value2.toString(); String infoDisplay_to = value2.toString();
if (parsedValue2 == null) if (parsedValue2 == null)
continue; continue;
if (table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID) if (table.getSelectedItem() != null && table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)
|| isExists) { || isExists) {
String where = ""; String where = "";
@ -2305,7 +2305,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
else else
m_query.addRestriction("NOT (" + clause + ")", openBrackets, andOr); m_query.addRestriction("NOT (" + clause + ")", openBrackets, andOr);
} else { } else {
if (table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID) if (table.getSelectedItem() != null && table.getSelectedItem().getValue().toString().equals(MAttribute.COLUMNNAME_M_Attribute_ID)
|| isExists) { || isExists) {
String where = ""; String where = "";
@ -2330,7 +2330,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
isCompositeExists = false; isCompositeExists = false;
} }
appendCode(code, ColumnName, Operator, value.toString(), value2 != null ? value2.toString() : "", andOr, lBrackets, rBrackets, TableName); appendCode(code, ColumnName, Operator, value.toString(), value2 != null ? value2.toString() : "", andOr, lBrackets, rBrackets, tableUID);
} }
saveQuery(saveQuery, code, shareAllUsers); saveQuery(saveQuery, code, shareAllUsers);