From c6b1d518cfedd721eb9f800fefb6f6f057203a99 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 21 Aug 2026 08:34:40 +0200 Subject: [PATCH 1/3] use correct model name --- application/controllers/api/frontend/v1/MaZeitsperren.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/MaZeitsperren.php b/application/controllers/api/frontend/v1/MaZeitsperren.php index ad5bf20a2..8e83e6df1 100644 --- a/application/controllers/api/frontend/v1/MaZeitsperren.php +++ b/application/controllers/api/frontend/v1/MaZeitsperren.php @@ -155,7 +155,7 @@ class MaZeitsperren extends FHCAPI_Controller { $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mitarbeiter UID']), self::ERROR_TYPE_GENERAL); } - $this->load->model('ressource/Person_model', 'PersonModel'); + $this->load->model('person/Person_model', 'PersonModel'); $result = $this->PersonModel->getFullName($uid); $data = $this->getDataOrTerminateWithError($result); From 916dab258410bdeea63e4f52f419f4f259d24f56 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 21 Aug 2026 08:36:58 +0200 Subject: [PATCH 2/3] add Zeitsperren to search result employee action buttons --- public/js/apps/Cis/Menu.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/public/js/apps/Cis/Menu.js b/public/js/apps/Cis/Menu.js index 8897b7b84..a037923f5 100644 --- a/public/js/apps/Cis/Menu.js +++ b/public/js/apps/Cis/Menu.js @@ -36,7 +36,22 @@ const app = Vue.createApp({ "/Cis/Profil/View/"+data.uid; } }, - childactions: [] + childactions: [ + { + label: Vue.computed(() => this.$p.t("profil/zeitsperren")), + icon: "fas fa-calendar-days", + type: "link", + action: function (data) { + const uid = JSON.parse(data.data).uid; + const link = + FHC_JS_DATA_STORAGE_OBJECT.app_root + + FHC_JS_DATA_STORAGE_OBJECT.ci_router + + "/Cis/Zeitsperrenma/ma/" + + uid; + return link; + } + } + ] }, student: { defaultaction: { From 1bbea69139a64fb8b05d4294dd5dc2071021748b Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 21 Aug 2026 11:41:21 +0200 Subject: [PATCH 3/3] refine menuItem content check --- application/controllers/api/frontend/v1/CisMenu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/CisMenu.php b/application/controllers/api/frontend/v1/CisMenu.php index 163c337ae..d5da7528f 100644 --- a/application/controllers/api/frontend/v1/CisMenu.php +++ b/application/controllers/api/frontend/v1/CisMenu.php @@ -83,7 +83,7 @@ class CisMenu extends FHCAPI_Controller return site_url("/CisVue/Cms/content/" . $menuItem->content_id); } - if (!$menuItem->content || !mb_strlen($menuItem->content)) { + if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) { return ''; }