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

Merge branch 'cis40_2026-05_ma_rc' into demo-cis40

Browse Source
This commit is contained in:
Harald Bamberger
2026-05-29 13:40:02 +02:00
parent 366edb7e90 6019489ef1
commit 63ff8dd4c4
14 changed files with 130 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Cis/ProjektabgabeUebersicht.php
+1 -7
View File
@@ -25,12 +25,6 @@ class ProjektabgabeUebersicht extends Auth_Controller
*/
public function index()
{
// TODO create permission
$viewData = array(
'uid' => getAuthUID(),
'showEdit' => true
);
$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'ProjektabgabeUebersicht']);
$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'ProjektabgabeUebersicht']);
}
}
application/controllers/api/frontend/v1/education/PaabgabeUebersicht.php
+13 -1
View File
@@ -27,11 +27,12 @@ class PaabgabeUebersicht extends FHCAPI_Controller
public function __construct()
{
parent::__construct([
'viewData' => self::PERM_LOGGED,
'getPaAbgaben' => array('lehre/abgabetool:r'),
'getStudiengaenge' => array('lehre/abgabetool:r'),
'getTermine' => array('lehre/abgabetool:r'),
'getPaAbgabetypen' => array('lehre/abgabetool:r'),
'downloadZip' => array('lehre/abgabetool:r')
'downloadZip' => array('lehre/abgabetool:r'),
//'downloadProjektarbeit' => array('lehre/abgabetool:r')
]);
@@ -45,6 +46,17 @@ class PaabgabeUebersicht extends FHCAPI_Controller
]);
}
public function viewData()
{
$viewData = [
"uid" => getAuthUID(),
// TODO create permission
"showEdit" => true,
];
$this->terminateWithSuccess($viewData);
}
/**
* Get Projektabgaben for search criteria.
*/
application/libraries/StundenplanLib.php
+4 -1
View File
@@ -361,7 +361,10 @@ class StundenplanLib
if (isError($ort_content_object)) {
return error(getData($ort_content_object));
}
$ort_content_object = getData($ort_content_object)[0];
$ort_content_object_data = getData($ort_content_object);
$ort_content_object = (is_array($ort_content_object_data) && count($ort_content_object_data) > 0)
? $ort_content_object_data[0]
: null;
if($ort_content_object) {
$item->ort_content_id = $ort_content_object->content_id;
}