From 18ee289509149f96fd4083459db604b240ed589b Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Wed, 8 May 2024 21:31:01 +0200 Subject: [PATCH] Update pagination logic and refine controller calculations --- application/Domain/DomainController.php | 2 +- application/HistoricTicket/HistoricTicketController.php | 2 +- application/VoiceCallHistory/VoiceCallHistoryController.php | 2 +- public/plugins/vue/tt-components/tt-table.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/Domain/DomainController.php b/application/Domain/DomainController.php index df84300c1..09d47c58e 100644 --- a/application/Domain/DomainController.php +++ b/application/Domain/DomainController.php @@ -128,7 +128,7 @@ class DomainController extends mfBaseController { "rows" => $domains, "pagination" => [ "page" => $page, - "total_pages" => ceil($totalRows / $perPage), + "total_pages" => ceil($filtered_available / $perPage), "per_page" => $perPage, "filtered_available" => intval($filtered_available), "total_rows" => intval($totalRows) diff --git a/application/HistoricTicket/HistoricTicketController.php b/application/HistoricTicket/HistoricTicketController.php index ed1dae5ae..b74a32b8a 100644 --- a/application/HistoricTicket/HistoricTicketController.php +++ b/application/HistoricTicket/HistoricTicketController.php @@ -66,7 +66,7 @@ class HistoricTicketController extends mfBaseController { "rows" => $historicTickets, "pagination" => [ "page" => $page, - "total_pages" => ceil($totalRows / $perPage), + "total_pages" => ceil($filtered_available / $perPage), "per_page" => $perPage, "filtered_available" => intval($filtered_available), "total_rows" => intval($totalRows) diff --git a/application/VoiceCallHistory/VoiceCallHistoryController.php b/application/VoiceCallHistory/VoiceCallHistoryController.php index 0a4ef5701..147a5f9d8 100644 --- a/application/VoiceCallHistory/VoiceCallHistoryController.php +++ b/application/VoiceCallHistory/VoiceCallHistoryController.php @@ -81,7 +81,7 @@ class VoiceCallHistoryController extends mfBaseController { "rows" => $calls, "pagination" => [ "page" => $page, - "total_pages" => ceil($totalRows / $perPage), + "total_pages" => ceil($filtered_available / $perPage), "per_page" => $perPage, "filtered_available" => intval($filtered_available), "total_rows" => intval($totalRows) diff --git a/public/plugins/vue/tt-components/tt-table.js b/public/plugins/vue/tt-components/tt-table.js index 07dd4e22c..d14f06df9 100644 --- a/public/plugins/vue/tt-components/tt-table.js +++ b/public/plugins/vue/tt-components/tt-table.js @@ -107,7 +107,7 @@ Vue.component('tt-table', { - + Keine Ergebnisse! @@ -406,7 +406,7 @@ Vue.component('tt-table', { pagesArray.push(i); } - return pagesArray; + return pagesArray.length === 0 ? [1] : pagesArray; }, computedRows() { if (!this.rawRows || this.ssr === true) return null;