blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Harald Bamberger
2024-11-04 15:59:14 +01:00
parent 50880c696b 50a67a8e88
commit 20e0e2e910
8 changed files with 65 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/CisVue.php
+2 -1
View File
@@ -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);
application/models/content/Content_model.php
+11 -1
View File
@@ -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;
application/views/templates/CISVUE-Header.php
+1 -1
View File
@@ -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, getAuthUID());
$menu = getData($result)->childs ?? [];
}