From 95e09aee8b951860ef41b57410046b64298459b7 Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Fri, 24 Jul 2009 08:10:47 +0000 Subject: [PATCH] The Tab Sort without parent column https://sourceforge.net/tracker/?func=detail&atid=879335&aid=2826406&group_id=176962 --- client/src/org/compiere/grid/VSortTab.java | 12 ++++++------ .../src/org/adempiere/webui/panel/ADSortTab.java | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/client/src/org/compiere/grid/VSortTab.java b/client/src/org/compiere/grid/VSortTab.java index 801c120a34..a0a51caede 100644 --- a/client/src/org/compiere/grid/VSortTab.java +++ b/client/src/org/compiere/grid/VSortTab.java @@ -427,7 +427,7 @@ public class VSortTab extends CPanel implements APanelTab } else { - sql.append(" WHERE 1=1"); + sql.append(" WHERE 1=?"); } if (m_IdentifierTranslated) @@ -445,16 +445,16 @@ public class VSortTab extends CPanel implements APanelTab ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, m_ParentColumnName); log.fine(sql.toString() + " - ID=" + ID); } + else + { + ID = 1; + } PreparedStatement pstmt = null; ResultSet rs = null; try { pstmt = DB.prepareStatement(sql.toString(), null); - //FR [ 2826406 ] - if(m_ParentColumnName != null) - { - pstmt.setInt(1, ID); - } + pstmt.setInt(1, ID); if (m_IdentifierTranslated) pstmt.setString(2, Env.getAD_Language(Env.getCtx())); diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java index dc83b058f9..cb2c4f0a22 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java @@ -408,7 +408,7 @@ public class ADSortTab extends Panel implements IADTabpanel } else { - sql.append(" WHERE 1=1"); + sql.append(" WHERE 1=?"); } if (m_IdentifierTranslated) sql.append(" AND t.").append(m_KeyColumnName).append("=tt.").append(m_KeyColumnName) @@ -425,16 +425,17 @@ public class ADSortTab extends Panel implements IADTabpanel ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, m_ParentColumnName); log.fine(sql.toString() + " - ID=" + ID); } + else + { + ID = 1; + } PreparedStatement pstmt = null; ResultSet rs = null; try { pstmt = DB.prepareStatement(sql.toString(), null); - //FR [ 2826406 ] - if(m_ParentColumnName != null) - { - pstmt.setInt(1, ID); - } + pstmt.setInt(1, ID); + if (m_IdentifierTranslated) pstmt.setString(2, Env.getAD_Language(Env.getCtx()));