blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 15:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cis40_2026-05_ma_rc_routerlink_ma0080' into cis40_2026-05_ma_rc_routerlink

Browse Source
This commit is contained in:
Harald Bamberger
2026-09-16 10:48:40 +02:00
parent aff83fae49 1b4297a9bf
commit 6faf1cbcc2
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/CisMenu.php
+1 -1
View File
@@ -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 '';
}
application/controllers/api/frontend/v1/MaZeitsperren.php
+1 -1
View File
@@ -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);
public/js/components/Cis/Menu.js
+16 -1
View File
@@ -60,7 +60,22 @@ export default {
"/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: {