diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php index 537537f08..b5433ebfe 100644 --- a/application/controllers/components/CisVue.php +++ b/application/controllers/components/CisVue.php @@ -31,7 +31,8 @@ class CisVue extends FHC_Controller public function Menu() { $this->load->model('content/Content_model', 'ContentModel'); - $result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid()); + $menu_contentID = $this->ContentModel->getMenuContentID(); + $result = $this->ContentModel->getMenu($menu_contentID, get_uid()); $menu = getData($result) ?? (object)['childs' => []]; $this->outputJsonSuccess($menu); diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php index 9f0a3634e..278022b59 100644 --- a/application/models/content/Content_model.php +++ b/application/models/content/Content_model.php @@ -71,13 +71,23 @@ class Content_model extends DB_Model * * @return integer|null content_id of the Cis4_Root Menu */ - public function getCIS4_ContentID(){ + public function getMenuContentID(){ + // early return if the CIS4_MENU_ENTRY constant is defined + if(defined('CIS4_MENU_ENTRY')) + { + return CIS4_MENU_ENTRY; + } + + // load the CIS4 Menu content_id from the database using the column 'beschreibugn' of the campus.tbl_content table $CIS4_ROOT_CONTENT = $this->loadWhere(["beschreibung"=>"CIS4_ROOT"]); + if(isError($CIS4_ROOT_CONTENT)) { return null; } + $CIS4_ROOT_CONTENT = getData($CIS4_ROOT_CONTENT); + if(count($CIS4_ROOT_CONTENT) > 0) { return current($CIS4_ROOT_CONTENT)->content_id ?? null; diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php index 6ee344391..70f9a173f 100644 --- a/application/views/templates/CISVUE-Header.php +++ b/application/views/templates/CISVUE-Header.php @@ -19,7 +19,7 @@ $this->load->view('templates/FHC-Header', $includesArray); if (!isset($menu)) { $ci =& get_instance(); // get CI instance $ci->load->model('content/Content_model', 'ContentModel'); - $cis4_content_id = $ci->ContentModel->getCIS4_ContentID(); + $cis4_content_id = $ci->ContentModel->getMenuContentID(); $result = $ci->ContentModel->getMenu($cis4_content_id, get_uid()); $menu = getData($result)->childs ?? []; }