From b914083d319f9210a8c1a35730696a66a75d1c6b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 31 May 2021 11:29:43 +0200 Subject: [PATCH] IDEMPIERE-4804 Message in Reset Password Panel is misleading (#702) --- migration/i8.2/oracle/202105291354_IDEMPIERE-4804.sql | 11 +++++++++++ .../i8.2/postgresql/202105291354_IDEMPIERE-4804.sql | 8 ++++++++ .../adempiere/webui/panel/ChangePasswordPanel.java | 6 +++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 migration/i8.2/oracle/202105291354_IDEMPIERE-4804.sql create mode 100644 migration/i8.2/postgresql/202105291354_IDEMPIERE-4804.sql diff --git a/migration/i8.2/oracle/202105291354_IDEMPIERE-4804.sql b/migration/i8.2/oracle/202105291354_IDEMPIERE-4804.sql new file mode 100644 index 0000000000..c33357a1a4 --- /dev/null +++ b/migration/i8.2/oracle/202105291354_IDEMPIERE-4804.sql @@ -0,0 +1,11 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-4804 Message in Reset Password Panel is misleading +-- May 29, 2021, 1:51:27 PM CEST +UPDATE AD_Message SET MsgText='The new password is now valid in: {0}',Updated=TO_DATE('2021-05-29 13:51:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200076 +; + +SELECT register_migration_script('202105291354_IDEMPIERE-4804.sql') FROM dual +; + diff --git a/migration/i8.2/postgresql/202105291354_IDEMPIERE-4804.sql b/migration/i8.2/postgresql/202105291354_IDEMPIERE-4804.sql new file mode 100644 index 0000000000..c03afbede4 --- /dev/null +++ b/migration/i8.2/postgresql/202105291354_IDEMPIERE-4804.sql @@ -0,0 +1,8 @@ +-- IDEMPIERE-4804 Message in Reset Password Panel is misleading +-- May 29, 2021, 1:51:27 PM CEST +UPDATE AD_Message SET MsgText='The new password is now valid in: {0}',Updated=TO_TIMESTAMP('2021-05-29 13:51:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200076 +; + +SELECT register_migration_script('202105291354_IDEMPIERE-4804.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java index bbdf4e6d3e..e1d77e4a42 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java @@ -334,6 +334,7 @@ public class ChangePasswordPanel extends Window implements EventListener throw new IllegalArgumentException(Msg.getMsg(m_ctx, "NewPasswordMustDiffer")); } + StringBuilder tenantsChanged = new StringBuilder(); Trx trx = null; try { @@ -360,6 +361,9 @@ public class ChangePasswordPanel extends Window implements EventListener try { PO.setCrossTenantSafe(); user.saveEx(trx.getTrxName()); + if (tenantsChanged.length() > 0) + tenantsChanged.append(", "); + tenantsChanged.append(clientKNPair.getName()); } finally { PO.clearCrossTenantSafe(); } @@ -379,7 +383,7 @@ public class ChangePasswordPanel extends Window implements EventListener trx.close(); } - String msg = Msg.getMsg(m_ctx, "NewPasswordValidForAllTenants"); + String msg = Msg.getMsg(m_ctx, "NewPasswordValidForAllTenants", new Object[] {tenantsChanged}); Messagebox.showDialog(msg, AEnv.getDialogHeader(Env.getCtx(), 0), Messagebox.OK, Messagebox.INFORMATION, new Callback() { @Override public void onCallback(Integer result) {