From f43883f795273fed5df58f8f35a06f27980798be Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 2 Nov 2020 16:11:08 +0100 Subject: [PATCH] IDEMPIERE-4517 Some messages missing - toolbar (#347) --- .../oracle/202011021539_IDEMPIERE-4517.sql | 31 +++++++++++++++++++ .../202011021539_IDEMPIERE-4517.sql | 28 +++++++++++++++++ .../webui/adwindow/ADWindowToolbar.java | 12 +++---- 3 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 migration/i7.1z/oracle/202011021539_IDEMPIERE-4517.sql create mode 100644 migration/i7.1z/postgresql/202011021539_IDEMPIERE-4517.sql diff --git a/migration/i7.1z/oracle/202011021539_IDEMPIERE-4517.sql b/migration/i7.1z/oracle/202011021539_IDEMPIERE-4517.sql new file mode 100644 index 0000000000..12df30d6ea --- /dev/null +++ b/migration/i7.1z/oracle/202011021539_IDEMPIERE-4517.sql @@ -0,0 +1,31 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-4517 Some messages missing - toolbar +-- Nov 2, 2020, 3:13:25 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Grid Toggle',0,0,'Y',TO_DATE('2020-11-02 15:13:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-11-02 15:13:25','YYYY-MM-DD HH24:MI:SS'),100,200644,'Toggle','D','180ca04f-183f-459f-806e-f153f2682375') +; + +-- Nov 2, 2020, 3:13:40 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Parent Record',0,0,'Y',TO_DATE('2020-11-02 15:13:40','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-11-02 15:13:40','YYYY-MM-DD HH24:MI:SS'),100,200645,'ParentRecord','D','b278e708-8445-495a-b180-20d527025e9c') +; + +-- Nov 2, 2020, 3:13:53 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Detail record',0,0,'Y',TO_DATE('2020-11-02 15:13:52','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-11-02 15:13:52','YYYY-MM-DD HH24:MI:SS'),100,200646,'DetailRecord','D','e389b9a4-03c1-4681-aa00-573bc57515cb') +; + +-- Nov 2, 2020, 3:14:04 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Active Workflows',0,0,'Y',TO_DATE('2020-11-02 15:14:04','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-11-02 15:14:04','YYYY-MM-DD HH24:MI:SS'),100,200647,'ActiveWorkflows','D','0706bb1e-9700-42bc-92ec-3890ee22a18e') +; + +-- Nov 2, 2020, 3:14:15 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Check Requests',0,0,'Y',TO_DATE('2020-11-02 15:14:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-11-02 15:14:15','YYYY-MM-DD HH24:MI:SS'),100,200648,'Requests','D','8189a7f3-5e9d-432e-9c9e-7479f8352527') +; + +-- Nov 2, 2020, 3:14:27 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Product Info',0,0,'Y',TO_DATE('2020-11-02 15:14:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2020-11-02 15:14:27','YYYY-MM-DD HH24:MI:SS'),100,200649,'ProductInfo','D','aed93a4d-24e5-42b7-81a6-975c18b85e20') +; + +SELECT register_migration_script('202011021539_IDEMPIERE-4517.sql') FROM dual +; + diff --git a/migration/i7.1z/postgresql/202011021539_IDEMPIERE-4517.sql b/migration/i7.1z/postgresql/202011021539_IDEMPIERE-4517.sql new file mode 100644 index 0000000000..d0ca94d1ad --- /dev/null +++ b/migration/i7.1z/postgresql/202011021539_IDEMPIERE-4517.sql @@ -0,0 +1,28 @@ +-- IDEMPIERE-4517 Some messages missing - toolbar +-- Nov 2, 2020, 3:13:25 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Grid Toggle',0,0,'Y',TO_TIMESTAMP('2020-11-02 15:13:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-11-02 15:13:25','YYYY-MM-DD HH24:MI:SS'),100,200644,'Toggle','D','180ca04f-183f-459f-806e-f153f2682375') +; + +-- Nov 2, 2020, 3:13:40 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Parent Record',0,0,'Y',TO_TIMESTAMP('2020-11-02 15:13:40','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-11-02 15:13:40','YYYY-MM-DD HH24:MI:SS'),100,200645,'ParentRecord','D','b278e708-8445-495a-b180-20d527025e9c') +; + +-- Nov 2, 2020, 3:13:53 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Detail record',0,0,'Y',TO_TIMESTAMP('2020-11-02 15:13:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-11-02 15:13:52','YYYY-MM-DD HH24:MI:SS'),100,200646,'DetailRecord','D','e389b9a4-03c1-4681-aa00-573bc57515cb') +; + +-- Nov 2, 2020, 3:14:04 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Active Workflows',0,0,'Y',TO_TIMESTAMP('2020-11-02 15:14:04','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-11-02 15:14:04','YYYY-MM-DD HH24:MI:SS'),100,200647,'ActiveWorkflows','D','0706bb1e-9700-42bc-92ec-3890ee22a18e') +; + +-- Nov 2, 2020, 3:14:15 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','Check Requests',0,0,'Y',TO_TIMESTAMP('2020-11-02 15:14:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-11-02 15:14:15','YYYY-MM-DD HH24:MI:SS'),100,200648,'Requests','D','8189a7f3-5e9d-432e-9c9e-7479f8352527') +; + +-- Nov 2, 2020, 3:14:27 PM CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('M','Product Info',0,0,'Y',TO_TIMESTAMP('2020-11-02 15:14:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2020-11-02 15:14:27','YYYY-MM-DD HH24:MI:SS'),100,200649,'ProductInfo','D','aed93a4d-24e5-42b7-81a6-975c18b85e20') +; + +SELECT register_migration_script('202011021539_IDEMPIERE-4517.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java index 885c3f1734..200978731f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java @@ -231,11 +231,11 @@ public class ADWindowToolbar extends FToolbar implements EventListener btnAttachment = createButton("Attachment", "Attachment", "Attachment"); btnPostIt = createButton("PostIt", "PostIt", "PostIt"); btnChat = createButton("Chat", "Chat", "Chat"); - btnGridToggle = createButton("Toggle", "Multi", "Multi"); + btnGridToggle = createButton("Toggle", "Multi", "Toggle"); btnGridToggle.setTooltiptext(btnGridToggle.getTooltiptext()+ " Alt+T"); - btnParentRecord = createButton("ParentRecord", "Parent", "Parent"); + btnParentRecord = createButton("ParentRecord", "Parent", "ParentRecord"); btnParentRecord.setTooltiptext(btnParentRecord.getTooltiptext()+ " Alt+Up"); - btnDetailRecord = createButton("DetailRecord", "Detail", "Detail"); + btnDetailRecord = createButton("DetailRecord", "Detail", "DetailRecord"); btnDetailRecord.setTooltiptext(btnDetailRecord.getTooltiptext()+ " Alt+Down"); btnReport = createButton("Report", "Report", "Report"); btnReport.setTooltiptext(btnReport.getTooltiptext()+ " Alt+R"); @@ -248,10 +248,10 @@ public class ADWindowToolbar extends FToolbar implements EventListener btnLock.setVisible(isPersonalLock); } btnZoomAcross = createButton("ZoomAcross", "ZoomAcross", "ZoomAcross"); - btnActiveWorkflows = createButton("ActiveWorkflows", "WorkFlow", "WorkFlow"); - btnRequests = createButton("Requests", "Request", "Request"); + btnActiveWorkflows = createButton("ActiveWorkflows", "WorkFlow", "ActiveWorkflows"); + btnRequests = createButton("Requests", "Request", "Requests"); if (isAllowProductInfo) { - btnProductInfo = createButton("ProductInfo", "Product", "InfoProduct"); + btnProductInfo = createButton("ProductInfo", "Product", "ProductInfo"); btnProductInfo.setDisabled(!isAllowProductInfo); // Elaine 2008/07/22 btnProductInfo.setVisible(isAllowProductInfo); }