Patch #1665299 Cancel Opening Window
This commit is contained in:
parent
535704cd95
commit
1e8c7efa36
|
@ -75,6 +75,7 @@ public final class APanel extends CPanel
|
||||||
private static CLogger log = CLogger.getCLogger(APanel.class);
|
private static CLogger log = CLogger.getCLogger(APanel.class);
|
||||||
|
|
||||||
private AWindow m_window;
|
private AWindow m_window;
|
||||||
|
private boolean isCancel = false; //Goodwill
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Dispose
|
* Dispose
|
||||||
|
@ -526,7 +527,9 @@ public final class APanel extends CPanel
|
||||||
// initial user query for single workbench tab
|
// initial user query for single workbench tab
|
||||||
if (m_mWorkbench.getWindowCount() == 1)
|
if (m_mWorkbench.getWindowCount() == 1)
|
||||||
{
|
{
|
||||||
|
isCancel = false; //Goodwill
|
||||||
query = initialQuery (query, gTab);
|
query = initialQuery (query, gTab);
|
||||||
|
if (isCancel) return false; //Cancel opening window
|
||||||
if (query != null && query.getRecordCount() <= 1)
|
if (query != null && query.getRecordCount() <= 1)
|
||||||
goSingleRow = true;
|
goSingleRow = true;
|
||||||
}
|
}
|
||||||
|
@ -716,6 +719,7 @@ public final class APanel extends CPanel
|
||||||
mTab.getAD_Table_ID(), mTab.getTableName(),
|
mTab.getAD_Table_ID(), mTab.getTableName(),
|
||||||
where.toString(), findFields, 10); // no query below 10
|
where.toString(), findFields, 10); // no query below 10
|
||||||
query = find.getQuery();
|
query = find.getQuery();
|
||||||
|
isCancel = (query == null);//Goodwill
|
||||||
find.dispose();
|
find.dispose();
|
||||||
find = null;
|
find = null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue