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

IDEMPIERE-973 problem with searching in System Element

This commit is contained in:
Richard Morales 2013-05-28 21:09:07 -05:00
parent 2a9162fec2
commit 4b3295e563
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.adempiere.base/src/org/compiere/model/MTable.java
View File

@ -335,6 +335,27 @@ public class MTable extends X_AD_Table
retValue = list.toArray(retValue); retValue = list.toArray(retValue);
return retValue; return retValue;
} // getKeyColumns } // getKeyColumns
/**
* Get Identifier Columns of Table
* @return Identifier columns
*/
public String[] getIdentifierColumns()
{
getColumns(false);
ArrayList<String> list = new ArrayList<String>();
//
for (int i = 0; i < m_columns.length; i++)
{
MColumn column = m_columns[i];
if (column.isIdentifier())
list.add(column.getColumnName());
}
String[] retValue = new String[list.size()];
retValue = list.toArray(retValue);
return retValue;
} // getIdentifierColumns
/************************************************************************** /**************************************************************************
* Get PO Class Instance * Get PO Class Instance

20
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
View File

@ -37,6 +37,7 @@ import org.adempiere.webui.window.FDialog;
import org.compiere.minigrid.ColumnInfo; import org.compiere.minigrid.ColumnInfo;
import org.compiere.minigrid.IDColumn; import org.compiere.minigrid.IDColumn;
import org.compiere.model.I_C_ElementValue; import org.compiere.model.I_C_ElementValue;
import org.compiere.model.MTable;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -120,17 +121,22 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener<Event>
if (queryValue != null && queryValue.length() > 0) if (queryValue != null && queryValue.length() > 0)
{ {
String separator = I_C_ElementValue.Table_Name.equalsIgnoreCase(p_tableName) ? "-" : "_"; MTable table = MTable.get(Env.getCtx(), p_tableName);
if (txt2.isVisible()) if (table.getIdentifierColumns().length > 1)
{ {
String[] values = queryValue.split("["+separator+"]"); String separator = I_C_ElementValue.Table_Name.equalsIgnoreCase(p_tableName) ? "-" : "_";
if (values != null && values.length == 2) if (txt2.isVisible())
{ {
txt1.setValue(values[0]); String[] values = queryValue.split("["+separator+"]");
txt2.setValue(values[1]); if (values != null && values.length == 2)
{
txt1.setValue(values[0]);
txt2.setValue(values[1]);
}
} }
}
}
executeQuery(); executeQuery();
renderItems(); renderItems();
} }