Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_cleanup_merge_anrechnungen_bs5

This commit is contained in:
Harald Bamberger
2024-11-04 15:59:14 +01:00
8 changed files with 65 additions and 25 deletions
@@ -26,7 +26,8 @@ class CisVue extends Auth_Controller
public function Menu()
{
$this->load->model('content/Content_model', 'ContentModel');
$result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, getAuthUID());
$menu_contentID = $this->ContentModel->getMenuContentID();
$result = $this->ContentModel->getMenu($menu_contentID, getAuthUID());
$menu = getData($result) ?? (object)['childs' => []];
$this->outputJsonSuccess($menu);