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

IDEMPIERE-1960 InfoWindow: Can't set column with context variable as selection column.

This commit is contained in:
Heng Sin Low 2014-05-21 11:58:15 +08:00
parent cfa8050b0b
commit 2b750ba2a2
7 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoBPartnerWindow.java
View File

@ -107,6 +107,7 @@ public class InfoBPartnerWindow extends InfoWindow {
}
}
}
dynamicDisplay(null);
}
@Override

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInOutWindow.java
View File

@ -67,5 +67,6 @@ public class InfoInOutWindow extends InfoWindow {
}
}
}
dynamicDisplay(null);
}
}

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoInvoiceWindow.java
View File

@ -78,6 +78,7 @@ public class InfoInvoiceWindow extends InfoWindow {
}
}
}
dynamicDisplay(null);
}
}

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoOrderWindow.java
View File

@ -78,5 +78,6 @@ public class InfoOrderWindow extends InfoWindow {
}
}
}
dynamicDisplay(null);
}
}

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoPaymentWindow.java
View File

@ -67,5 +67,6 @@ public class InfoPaymentWindow extends InfoWindow {
}
}
}
dynamicDisplay(null);
}
}

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

@ -130,6 +130,7 @@ public class InfoProductWindow extends InfoWindow {
protected void createParameterPanel() {
super.createParameterPanel();
initParameters();
dynamicDisplay(null);
}
@Override

60
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
View File

@ -228,7 +228,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
StringBuilder builder = new StringBuilder(p_whereClause != null ? p_whereClause.trim() : "");
String infoWhereClause = infoWindow.getWhereClause();
if (infoWhereClause != null && infoWhereClause.indexOf("@") >= 0) {
infoWhereClause = Env.parseContext(Env.getCtx(), p_WindowNo, infoWhereClause, false, false);
infoWhereClause = Env.parseContext(Env.getCtx(), p_WindowNo, infoWhereClause, true, false);
if (infoWhereClause.length() == 0)
log.log(Level.SEVERE, "Cannot parse context= " + infoWindow.getWhereClause());
}
@ -346,6 +346,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
}
int count = 0;
for(WEditor editor : editors) {
if (!editor.isVisible())
continue;
if (editor instanceof IWhereClauseEditor) {
String whereClause = ((IWhereClauseEditor) editor).getWhereClause();
if (whereClause != null && whereClause.trim().length() > 0) {
@ -393,7 +396,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
if (mInfoColumn.getQueryFunction() != null && mInfoColumn.getQueryFunction().trim().length() > 0) {
String function = mInfoColumn.getQueryFunction();
if (function.indexOf("@") >= 0) {
String s = Env.parseContext(infoContext, p_WindowNo, function, false, false);
String s = Env.parseContext(infoContext, p_WindowNo, function, true, false);
if (s.length() == 0) {
log.log(Level.SEVERE, "Failed to parse query function. " + function);
} else {
@ -417,7 +420,11 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
if (count > 0 && !checkAND.isChecked()) {
builder.append(" ) ");
}
return builder.toString();
String sql = builder.toString();
if (sql.indexOf("@") >= 0) {
sql = Env.parseContext(infoContext, p_WindowNo, sql, true, true);
}
return sql;
}
private MInfoColumn findInfoColumn(GridField gridField) {
@ -436,7 +443,10 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
protected void setParameters(PreparedStatement pstmt, boolean forCount)
throws SQLException {
int parameterIndex = 0;
for(WEditor editor : editors) {
for(WEditor editor : editors) {
if (!editor.isVisible())
continue;
if (editor.getGridField() != null && editor.getValue() != null && editor.getValue().toString().trim().length() > 0) {
MInfoColumn mInfoColumn = findInfoColumn(editor.getGridField());
if (mInfoColumn == null || mInfoColumn.getSelectClause().equals("0")) {
@ -483,7 +493,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
}
if (m_sqlOrder != null && m_sqlOrder.indexOf("@") >= 0) {
String sql = Env.parseContext(infoContext, p_WindowNo, m_sqlOrder, false, false);
String sql = Env.parseContext(infoContext, p_WindowNo, m_sqlOrder, true, false);
if (sql == null || sql.length() == 0) {
log.severe("Failed to parsed sql. sql=" + m_sqlOrder);
} else {
@ -793,7 +803,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
if (infoWindow.getOtherClause() != null && infoWindow.getOtherClause().trim().length() > 0) {
String otherClause = infoWindow.getOtherClause();
if (otherClause.indexOf("@") >= 0) {
String s = Env.parseContext(infoContext, p_WindowNo, otherClause, false, false);
String s = Env.parseContext(infoContext, p_WindowNo, otherClause, true, false);
if (s.length() == 0) {
log.severe("Failed to parse other clause. " + otherClause);
} else {
@ -830,8 +840,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
public void valueChange(ValueChangeEvent evt) {
if (evt != null && evt.getSource() instanceof WEditor)
{
WEditor editor = (WEditor)evt.getSource();
boolean asiChanged = false;
WEditor editor = (WEditor)evt.getSource();
if (evt.getNewValue() == null) {
Env.setContext(infoContext, p_WindowNo, editor.getColumnName(), "");
Env.setContext(infoContext, p_WindowNo, Env.TAB_INFO, editor.getColumnName(), "");
@ -845,24 +854,29 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
Env.setContext(infoContext, p_WindowNo, editor.getColumnName(), evt.getNewValue().toString());
Env.setContext(infoContext, p_WindowNo, Env.TAB_INFO, editor.getColumnName(), evt.getNewValue().toString());
}
// if attribute set changed (from any value to any value) clear the attribute set instance m_pAttributeWhere
if (editor instanceof WTableDirEditor && editor.getColumnName().equals("M_AttributeSet_ID"))
asiChanged = true;
for(WEditor otherEditor : editors)
{
if (otherEditor == editor)
continue;
if (asiChanged && otherEditor instanceof WInfoPAttributeEditor)
((WInfoPAttributeEditor)otherEditor).clearWhereClause();
otherEditor.dynamicDisplay();
}
evalDisplayLogic();
dynamicDisplay(editor);
}
}
protected void dynamicDisplay(WEditor editor) {
// if attribute set changed (from any value to any value) clear the attribute set instance m_pAttributeWhere
boolean asiChanged = false;
if (editor != null && editor instanceof WTableDirEditor && editor.getColumnName().equals("M_AttributeSet_ID"))
asiChanged = true;
for(WEditor otherEditor : editors)
{
if (otherEditor == editor)
continue;
if (asiChanged && otherEditor instanceof WInfoPAttributeEditor)
((WInfoPAttributeEditor)otherEditor).clearWhereClause();
otherEditor.dynamicDisplay();
}
evalDisplayLogic();
}
public void onEvent(Event event)
{