From 515d6a14cf7930d22530c3adfa8338117f813df5 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 25 Aug 2016 22:07:44 +0800 Subject: [PATCH] 1006079 Ease edit of OnLine Context Help. / IDEMPIERE-3438 --- .../i4.1z/oracle/201608251800_Ticket_1006079.sql | 15 +++++++++++++++ .../postgresql/201608251800_Ticket_1006079.sql | 12 ++++++++++++ .../webui/window/WCtxHelpSuggestion.java | 2 +- .../adempiere/webui/window/WFieldSuggestion.java | 2 +- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 migration/i4.1z/oracle/201608251800_Ticket_1006079.sql create mode 100644 migration/i4.1z/postgresql/201608251800_Ticket_1006079.sql diff --git a/migration/i4.1z/oracle/201608251800_Ticket_1006079.sql b/migration/i4.1z/oracle/201608251800_Ticket_1006079.sql new file mode 100644 index 0000000000..3edd3fd920 --- /dev/null +++ b/migration/i4.1z/oracle/201608251800_Ticket_1006079.sql @@ -0,0 +1,15 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Aug 25, 2016 8:44:13 PM MYT +-- 1006079 Ease edit of ctx help +UPDATE AD_Process_Para SET DisplayLogic='@AD_UserClient_ID@>0',Updated=TO_DATE('2016-08-25 20:44:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200178 +; + +-- Aug 25, 2016 10:00:40 PM MYT +UPDATE AD_Field SET DisplayLogic='@AD_UserClient_ID@>0',Updated=TO_DATE('2016-08-25 22:00:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204263 +; + +SELECT register_migration_script('201608251800_Ticket_1006079.sql') FROM dual +; + diff --git a/migration/i4.1z/postgresql/201608251800_Ticket_1006079.sql b/migration/i4.1z/postgresql/201608251800_Ticket_1006079.sql new file mode 100644 index 0000000000..cb257b55b3 --- /dev/null +++ b/migration/i4.1z/postgresql/201608251800_Ticket_1006079.sql @@ -0,0 +1,12 @@ +-- Aug 25, 2016 8:44:13 PM MYT +-- 1006079 Ease edit of ctx help +UPDATE AD_Process_Para SET DisplayLogic='@AD_UserClient_ID@>0',Updated=TO_TIMESTAMP('2016-08-25 20:44:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200178 +; + +-- Aug 25, 2016 10:00:40 PM MYT +UPDATE AD_Field SET DisplayLogic='@AD_UserClient_ID@>0',Updated=TO_TIMESTAMP('2016-08-25 22:00:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=204263 +; + +SELECT register_migration_script('201608251800_Ticket_1006079.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java index 9d51e0e344..9e9af15a3e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java @@ -254,7 +254,7 @@ public class WCtxHelpSuggestion extends Window implements EventListener { } suggestion.setAD_Language(Env.getAD_Language(Env.getCtx())); suggestion.setAD_User_ID(Env.getAD_User_ID(Env.getCtx())); - suggestion.setAD_UserClient_ID(Env.getAD_Client_ID(Env.getCtx())); + suggestion.set_ValueOfColumn("AD_UserClient_ID", Env.getAD_Client_ID(Env.getCtx())); suggestion.setIsApproved(false); suggestion.setProcessed(false); suggestion.setMsgText(helpTextbox.getValue()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java index 9a28444651..3ebad48a86 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldSuggestion.java @@ -142,7 +142,7 @@ public class WFieldSuggestion extends Window implements EventListener { suggestion.setAD_Language(Env.getAD_Language(Env.getCtx())); suggestion.setAD_Org_ID(0); suggestion.setAD_User_ID(Env.getAD_User_ID(Env.getCtx())); - suggestion.setAD_UserClient_ID(Env.getAD_Client_ID(Env.getCtx())); + suggestion.set_ValueOfColumn("AD_UserClient_ID",Env.getAD_Client_ID(Env.getCtx())); suggestion.setDescription(descriptionTextbox.getText()); suggestion.setHelp(helpTextbox.getText()); suggestion.setName(nameTextbox.getText());