From 1ac7b129c36fd7fb5018a37caa2e8f3dcde839d5 Mon Sep 17 00:00:00 2001
From: MightyMCoder <130976036+MightyMCoder@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:28:49 +0100
Subject: [PATCH 1/2] fix: '-' in HtmlTable Ids prevent using modal windows

---
 adm_program/system/classes/HtmlDataTables.php       | 8 ++++----
 adm_program/system/classes/ModuleDocumentsFiles.php | 2 +-
 adm_program/system/classes/ModuleGroupsRoles.php    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/adm_program/system/classes/HtmlDataTables.php b/adm_program/system/classes/HtmlDataTables.php
index 879c985bce..9b96bc710a 100644
--- a/adm_program/system/classes/HtmlDataTables.php
+++ b/adm_program/system/classes/HtmlDataTables.php
@@ -172,11 +172,11 @@ public function createJavascript(int $rowCount = 0, int $columnCount = 0)
             $javascriptGroupFunction = '
                 // Order by the grouping
                 $("#' . $this->id . ' tbody").on("click", "tr.admidio-group-heading", function() {
-                    const currentOrder = admidioTable_'. $this->id . '.order()[0];
+                    const currentOrder = admidioTable_' . $this->id . '.order()[0];
                     if (currentOrder[0] === ' . $this->groupedColumn . ' && currentOrder[1] === "asc") {
-                        admidioTable_'. $this->id . '.order([' . $this->groupedColumn . ', "desc"]).draw();
+                        admidioTable_' . $this->id . '.order([' . $this->groupedColumn . ', "desc"]).draw();
                     } else {
-                        admidioTable_'. $this->id . '.order([' . $this->groupedColumn . ', "asc"]).draw();
+                        admidioTable_' . $this->id . '.order([' . $this->groupedColumn . ', "asc"]).draw();
                     }
                 });';
         }
@@ -197,7 +197,7 @@ public function createJavascript(int $rowCount = 0, int $columnCount = 0)
         }
         $this->htmlPage->addJavascript(
             '
-            const admidioTable_'. $this->id . ' = $("#' . $this->id . '").DataTable({' .
+            const admidioTable_' . $this->id . ' = $("#' . $this->id . '").DataTable({' .
             implode(',', $this->datatablesInitParameters) .
             $javascriptGroup . '
             });
diff --git a/adm_program/system/classes/ModuleDocumentsFiles.php b/adm_program/system/classes/ModuleDocumentsFiles.php
index 0f3ea9545d..5b8e0af510 100644
--- a/adm_program/system/classes/ModuleDocumentsFiles.php
+++ b/adm_program/system/classes/ModuleDocumentsFiles.php
@@ -153,7 +153,7 @@ public function createContentList()
         }
 
         // initialize and set the parameter for DataTables
-        $dataTables = new HtmlDataTables($this, 'documents-files-table');
+        $dataTables = new HtmlDataTables($this, 'documents_files_table');
         $dataTables->disableDatatablesColumnsSort(array(1, 6));
         $dataTables->setDatatablesColumnsNotHideResponsive(array(6));
         $dataTables->createJavascript(count($this->data), 6);
diff --git a/adm_program/system/classes/ModuleGroupsRoles.php b/adm_program/system/classes/ModuleGroupsRoles.php
index 93eda0e49b..c105a94999 100644
--- a/adm_program/system/classes/ModuleGroupsRoles.php
+++ b/adm_program/system/classes/ModuleGroupsRoles.php
@@ -376,7 +376,7 @@ public function createContentPermissionsList()
         }
 
         // initialize and set the parameter for DataTables
-        $dataTables = new HtmlDataTables($this, 'role-permissions-table');
+        $dataTables = new HtmlDataTables($this, 'role_permissions_table');
         $dataTables->setDatatablesGroupColumn(1);
         $dataTables->disableDatatablesColumnsSort(array(3, 8));
         $dataTables->setDatatablesColumnsNotHideResponsive(array(8));

From 4dcc5d4889f385f56f15209978f8b316382bdfc9 Mon Sep 17 00:00:00 2001
From: MightyMCoder <130976036+MightyMCoder@users.noreply.github.com>
Date: Wed, 29 Jan 2025 16:32:57 +0100
Subject: [PATCH 2/2] add "adm_"-prefix to table ids

---
 adm_program/system/classes/ModuleDocumentsFiles.php | 2 +-
 adm_program/system/classes/ModuleGroupsRoles.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/adm_program/system/classes/ModuleDocumentsFiles.php b/adm_program/system/classes/ModuleDocumentsFiles.php
index 5b8e0af510..2c7aca7b3f 100644
--- a/adm_program/system/classes/ModuleDocumentsFiles.php
+++ b/adm_program/system/classes/ModuleDocumentsFiles.php
@@ -153,7 +153,7 @@ public function createContentList()
         }
 
         // initialize and set the parameter for DataTables
-        $dataTables = new HtmlDataTables($this, 'documents_files_table');
+        $dataTables = new HtmlDataTables($this, 'adm_documents_files_table');
         $dataTables->disableDatatablesColumnsSort(array(1, 6));
         $dataTables->setDatatablesColumnsNotHideResponsive(array(6));
         $dataTables->createJavascript(count($this->data), 6);
diff --git a/adm_program/system/classes/ModuleGroupsRoles.php b/adm_program/system/classes/ModuleGroupsRoles.php
index c105a94999..d3458547d9 100644
--- a/adm_program/system/classes/ModuleGroupsRoles.php
+++ b/adm_program/system/classes/ModuleGroupsRoles.php
@@ -376,7 +376,7 @@ public function createContentPermissionsList()
         }
 
         // initialize and set the parameter for DataTables
-        $dataTables = new HtmlDataTables($this, 'role_permissions_table');
+        $dataTables = new HtmlDataTables($this, 'adm_role_permissions_table');
         $dataTables->setDatatablesGroupColumn(1);
         $dataTables->disableDatatablesColumnsSort(array(3, 8));
         $dataTables->setDatatablesColumnsNotHideResponsive(array(8));