From 7b498798dfee22a74fb9007e1bce937ec60b81eb Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 4 Jul 2013 18:25:42 -0500 Subject: [PATCH] IDEMPIERE-1133 Customize grid not translated / peer review and complete --- .../oracle/201307041818_IDEMPIERE-1133.sql | 13 +++++++++++++ .../postgresql/201307041818_IDEMPIERE-1133.sql | 13 +++++++++++++ .../webui/panel/CustomizeGridViewPanel.java | 8 ++++---- 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 migration/i1.0c-release/oracle/201307041818_IDEMPIERE-1133.sql create mode 100644 migration/i1.0c-release/postgresql/201307041818_IDEMPIERE-1133.sql diff --git a/migration/i1.0c-release/oracle/201307041818_IDEMPIERE-1133.sql b/migration/i1.0c-release/oracle/201307041818_IDEMPIERE-1133.sql new file mode 100644 index 0000000000..81a4a0594b --- /dev/null +++ b/migration/i1.0c-release/oracle/201307041818_IDEMPIERE-1133.sql @@ -0,0 +1,13 @@ +-- 4/07/2013 06:07:52 PM COT +-- IDEMPIERE-1133 Customize grid not translated +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Org_ID,AD_Client_ID,EntityType) VALUES ('I','Save Column Width',200186,'e55bb769-5507-483c-bfd4-c938c5c5d93f','SaveColumnWidth','Y',TO_DATE('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),100,100,TO_DATE('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),0,0,'D') +; + +-- 4/07/2013 06:07:52 PM COT +-- IDEMPIERE-1133 Customize grid not translated +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200186 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('201307041818_IDEMPIERE-1133.sql') FROM dual +; + diff --git a/migration/i1.0c-release/postgresql/201307041818_IDEMPIERE-1133.sql b/migration/i1.0c-release/postgresql/201307041818_IDEMPIERE-1133.sql new file mode 100644 index 0000000000..1a62c356f7 --- /dev/null +++ b/migration/i1.0c-release/postgresql/201307041818_IDEMPIERE-1133.sql @@ -0,0 +1,13 @@ +-- 4/07/2013 06:07:52 PM COT +-- IDEMPIERE-1133 Customize grid not translated +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,Created,AD_Org_ID,AD_Client_ID,EntityType) VALUES ('I','Save Column Width',200186,'e55bb769-5507-483c-bfd4-c938c5c5d93f','SaveColumnWidth','Y',TO_TIMESTAMP('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),100,100,TO_TIMESTAMP('2013-07-04 18:07:52','YYYY-MM-DD HH24:MI:SS'),0,0,'D') +; + +-- 4/07/2013 06:07:52 PM COT +-- IDEMPIERE-1133 Customize grid not translated +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200186 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('201307041818_IDEMPIERE-1133.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java index a3cd5a5274..080303696b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java @@ -231,7 +231,7 @@ public class CustomizeGridViewPanel extends Panel Div div = new Div(); div.setStyle("margin-top:5px"); div.appendChild(chkSaveWidth); - chkSaveWidth.setLabel("Save Column Width"); + chkSaveWidth.setLabel(Msg.getMsg(Env.getCtx(), "SaveColumnWidth")); centerPanel.appendChild(div); center.appendChild(centerPanel); @@ -299,10 +299,10 @@ public class CustomizeGridViewPanel extends Panel boolean baseLanguage = Env.isBaseLanguage(Env.getCtx(), "AD_Field"); String sql; if (baseLanguage) - sql = "SELECT t.AD_Field_ID,t.Name,t.SeqNoGrid,AD_Client_ID, AD_Org_ID FROM AD_Field t WHERE t.AD_Tab_ID=? AND t.IsDisplayedGrid ='Y' ORDER BY 3,2"; + sql = "SELECT t.AD_Field_ID,t.Name,t.SeqNoGrid,AD_Client_ID, AD_Org_ID FROM AD_Field t WHERE t.AD_Tab_ID=? AND t.IsDisplayedGrid ='Y' AND t.IsActive='Y' ORDER BY 3,2"; else - sql = "SELECT t.AD_Field_ID,trl.Name,t.SeqNoGrid,t.AD_Client_ID, t.AD_Org_ID FROM AD_Field t , AD_Field_Trl trl " - + " WHERE t.AD_Tab_ID=? AND t.IsDisplayedGrid ='Y' AND (t.AD_Field_ID = trl.AD_Field_ID) AND trl.AD_Language=? ORDER BY 3,2"; + sql = "SELECT t.AD_Field_ID,trl.Name,t.SeqNoGrid,t.AD_Client_ID, t.AD_Org_ID FROM AD_Field t JOIN AD_Field_Trl trl ON (t.AD_Field_ID = trl.AD_Field_ID)" + + " WHERE t.AD_Tab_ID=? AND t.IsDisplayedGrid ='Y' AND t.IsActive='Y' AND trl.AD_Language=? ORDER BY 3,2"; PreparedStatement pstmt = null; ResultSet rs = null; try