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

IDEMPIERE-1979:auto requery with new value in parameter in info window after a action can make a Straggle . Peer review and fix NPE.

This commit is contained in:
Heng Sin Low 2014-07-03 20:40:00 +08:00
parent f42303a6b8
commit b7117fbe7e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
View File

@ -120,7 +120,7 @@ public class InfoProductWindow extends InfoWindow {
* when query not by click requery button, reuse prev where clause * when query not by click requery button, reuse prev where clause
* IDEMPIERE-1979 * IDEMPIERE-1979
*/ */
if (!isQueryByUser){ if (!isQueryByUser && prevWhereClause != null){
return prevWhereClause; return prevWhereClause;
} }

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
View File

@ -1237,10 +1237,10 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
*/ */
public void onUserQuery (){ public void onUserQuery (){
if (validateParameters()){ if (validateParameters()){
showBusyDialog(); showBusyDialog();
isQueryByUser = true; isQueryByUser = true;
Clients.response(new AuEcho(this, "onQueryCallback", null)); Clients.response(new AuEcho(this, "onQueryCallback", null));
} }
} }
/** /**
@ -1256,7 +1256,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
enableButtons(false); enableButtons(false);
// call run process in next request to disable all button control // call run process in next request to disable all button control
Events.echoEvent(ON_RUN_PROCESS, this, processId); Events.echoEvent(ON_RUN_PROCESS, this, processId);
} }
/** /**
* Run a process. * Run a process.
@ -1302,7 +1302,6 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
}else if (!m_pi.isError() && m_pi.getSummary() != null && m_pi.getSummary().trim().length() > 0){ }else if (!m_pi.isError() && m_pi.getSummary() != null && m_pi.getSummary().trim().length() > 0){
// when success, show summary if exists // when success, show summary if exists
FDialog.info(p_WindowNo, null, m_pi.getSummary()); FDialog.info(p_WindowNo, null, m_pi.getSummary());
isQueryByUser = false;
Clients.response(new AuEcho(InfoPanel.this, "onQueryCallback", m_results)); Clients.response(new AuEcho(InfoPanel.this, "onQueryCallback", m_results));
} }
@ -1358,6 +1357,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
} }
finally finally
{ {
isQueryByUser = false;
hideBusyDialog(); hideBusyDialog();
} }
} }