From f26e7d415b71daf9067af42897353d25f997d083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Wed, 15 Nov 2023 18:31:01 -0300
Subject: [PATCH] Fix issue when adding System Monitor charts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixes #18561
- Closes #18739

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 ChangeLog                       | 1 +
 js/src/server/status/monitor.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 089ad9af68..cb3f1b617a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@ phpMyAdmin - ChangeLog
 - issue #17347 Fixed JS errors when changing index settings on create table
 - issue        Fix BETWEEN search does not validate input because of spaces
 - issue        Fix JS number validation does not validate when the input is empty or emptied
+- issue #18561 Fix issue when adding System Monitor charts
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js
index e9b2372920..ef1ba7ee4c 100644
--- a/js/src/server/status/monitor.js
+++ b/js/src/server/status/monitor.js
@@ -570,6 +570,7 @@ AJAX.registerOnload('server/status/monitor.js', function () {
             saveMonitor(); // Save settings
 
             $('#closeModalButton').off('click');
+            $('#addChartButton').off('click');
         });
 
         $('#closeModalButton').on('click', function () {
@@ -577,6 +578,7 @@ AJAX.registerOnload('server/status/monitor.js', function () {
             $('span#clearSeriesLink').hide();
             $('#seriesPreview').html('');
             $('#closeModalButton').off('click');
+            $('#addChartButton').off('click');
         });
 
         var $presetList = $('#addChartModal').find('select[name="presetCharts"]');