IDEMPIERE-5171 GridTable duplicate WhereClause Fix (#1147)
* IDEMPIERE-5171 GridTable duplicate WhereClause Fix * IDEMPIERE-5171 GridTable Remove old commented code
This commit is contained in:
parent
81bb438237
commit
a32263c71f
|
@ -3012,13 +3012,13 @@ public class GridTable extends AbstractTableModel
|
||||||
close(false);
|
close(false);
|
||||||
if (retainedWhere != null)
|
if (retainedWhere != null)
|
||||||
{
|
{
|
||||||
// String whereClause = m_whereClause;
|
|
||||||
if (m_whereClause != null && m_whereClause.trim().length() > 0)
|
if (m_whereClause != null && m_whereClause.trim().length() > 0)
|
||||||
{
|
{
|
||||||
m_whereClause = "((" + m_whereClause + ") OR (" + retainedWhere + ")) ";
|
StringBuilder orRetainedWhere = new StringBuilder(") OR (").append(retainedWhere).append(")) ");
|
||||||
|
if (! m_whereClause.contains(orRetainedWhere.toString()))
|
||||||
|
m_whereClause = "((" + m_whereClause + orRetainedWhere.toString();
|
||||||
}
|
}
|
||||||
open(m_maxRows);
|
open(m_maxRows);
|
||||||
// m_whereClause = whereClause;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue