Merge pull request #1743 from Admidio/fix-HtmlDataTable

Admidio · Jan 29, 2025 · 5c8616e · 5c8616e
2 parents c0a806d + 4dcc5d4
commit 5c8616e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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));