From e976246ed78b1495cadc72d1af1d8d578eaa41c7 Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Tue, 13 May 2025 15:42:24 +0200 Subject: [PATCH] added new pop columns --- Layout/default/vueHeader.php | 2 -- application/Pop/PopController.php | 4 ++++ application/Pop/PopModel.php | 2 +- public/js/pages/Pop/Pop.js | 14 +++++++++++++- public/plugins/vue/tt-components/tt-table.js | 7 ++++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Layout/default/vueHeader.php b/Layout/default/vueHeader.php index 6d29c3b5a..e24275a07 100644 --- a/Layout/default/vueHeader.php +++ b/Layout/default/vueHeader.php @@ -70,8 +70,6 @@ - - diff --git a/application/Pop/PopController.php b/application/Pop/PopController.php index f1f225c8a..15d7d3ac1 100644 --- a/application/Pop/PopController.php +++ b/application/Pop/PopController.php @@ -32,6 +32,9 @@ class PopController extends mfBaseController "name" => $pop->name, "networkArea" => $pop->networks, "location" => $pop->location, + "state" => $pop->state, + "folder_link" => $pop->folder_link, + "doku_date" => $pop->doku_date, "vlan" => [ "public" => $pop->vlan_public, "nat" => $pop->vlan_nat, @@ -51,6 +54,7 @@ class PopController extends mfBaseController ], "NETWORKS" => $networks, "POPS" => $pops, + "IS_ADMIN" => $this->me->is("Admin"), ]; $this->layout()->set("vueViewName", "Pop"); diff --git a/application/Pop/PopModel.php b/application/Pop/PopModel.php index a96561c0a..3247a7c74 100644 --- a/application/Pop/PopModel.php +++ b/application/Pop/PopModel.php @@ -102,7 +102,7 @@ class PopModel { $items = []; $db = FronkDB::singleton(); - $sql = "SELECT `Pop`.`id`, `Pop`.`network_id`, `Pop`.`name`, `Pop`.`gps_lat`, `Pop`.`gps_long`, `Pop`.`location`, `Pop`.`vlan_public`, `Pop`.`vlan_nat`, `Pop`.`vlan_ipv6`, `Pop`.`note`,`Network`.`name` as Networkname FROM `Pop` + $sql = "SELECT `Pop`.*,`Network`.`name` as Networkname FROM `Pop` INNER JOIN `PopNetwork` ON (`Pop`.`id`=`PopNetwork`.`pop_id`) INNER JOIN `Network` ON (`Network`.`id`=`PopNetwork`.`network_id`)"; $res = $db->query($sql); diff --git a/public/js/pages/Pop/Pop.js b/public/js/pages/Pop/Pop.js index b8465cb28..7746c1f15 100644 --- a/public/js/pages/Pop/Pop.js +++ b/public/js/pages/Pop/Pop.js @@ -15,6 +15,10 @@ Vue.component('Pop', { + +