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

IDEMPIERE-2028 Find not requerying if not changed

This commit is contained in:
Carlos Ruiz 2014-06-30 12:07:47 -05:00
parent 02c221db86
commit 1ec538db0b
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.adempiere.base/src/org/compiere/model/GridTab.java
View File

@ -113,7 +113,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
/** /**
* *
*/ */
private static final long serialVersionUID = -4152187193662318491L; private static final long serialVersionUID = 1377113168185797983L;
public static final String DEFAULT_STATUS_MESSAGE = "NavigateOrUpdate"; public static final String DEFAULT_STATUS_MESSAGE = "NavigateOrUpdate";
@ -210,8 +210,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
private DataStatusEvent m_lastDataStatusEvent; private DataStatusEvent m_lastDataStatusEvent;
private String m_parsedWhere;
//Contains currently selected rows //Contains currently selected rows
private ArrayList<Integer> selection = null; private ArrayList<Integer> selection = null;
@ -626,10 +624,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo
+ " - Only Current Rows=" + onlyCurrentRows + " - Only Current Rows=" + onlyCurrentRows
+ ", Days=" + onlyCurrentDays + ", Detail=" + isDetail()); + ", Days=" + onlyCurrentDays + ", Detail=" + isDetail());
// is it same query?
boolean refresh = m_oldQuery.equals(m_query.getWhereClause())
&& m_vo.onlyCurrentRows == onlyCurrentRows && m_vo.onlyCurrentDays == onlyCurrentDays;
m_oldQuery = m_query.getWhereClause();
m_vo.onlyCurrentRows = onlyCurrentRows; m_vo.onlyCurrentRows = onlyCurrentRows;
m_vo.onlyCurrentDays = onlyCurrentDays; m_vo.onlyCurrentDays = onlyCurrentDays;
@ -670,8 +664,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
} }
// Same link value? // Same link value?
if (refresh)
refresh = m_linkValue.equals(value);
if (! m_linkValue.equals(value)) if (! m_linkValue.equals(value))
setQuery(null); setQuery(null);
m_linkValue = value; m_linkValue = value;
@ -704,23 +696,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
m_extendedWhere = where.toString(); m_extendedWhere = where.toString();
if (m_extendedWhere.indexOf("@") > 1)
{
String s = Env.parseContext(Env.getCtx(), getWindowNo(), m_extendedWhere, false);
if (s != null)
{
if (!(s.equals(m_parsedWhere)))
{
refresh = false;
}
}
else
{
refresh = false;
}
m_parsedWhere = s;
}
// Final Query // Final Query
if (m_query.isActive()) if (m_query.isActive())
{ {
@ -740,10 +715,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo + " - " + where); if (log.isLoggable(Level.FINE)) log.fine("#" + m_vo.TabNo + " - " + where);
if (m_mTable.isOpen()) if (m_mTable.isOpen())
{ {
if (refresh) m_mTable.dataRequery(where.toString(), m_vo.onlyCurrentRows && !isDetail(), onlyCurrentDays);
m_mTable.dataRefreshAll();
else
m_mTable.dataRequery(where.toString(), m_vo.onlyCurrentRows && !isDetail(), onlyCurrentDays);
} }
else else
{ {