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

Merge remote-tracking branch 'origin/master' into feature-61164/AbgabetoolQualityGates

Browse Source 
# Conflicts:
#	system/phrasesupdate.php
This commit is contained in:
Johann Hoffmann
2025-10-27 14:51:52 +01:00
parent 259c2aec14 3c9a52e389
commit ac1e0a8aa3
138 changed files with 11074 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Cis/Documents.php
+1 -1
View File
@@ -72,7 +72,7 @@ class Documents extends Auth_Controller
$stgs = [];
$stsemArray = [];
$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
$buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : [];
$person_ids = [];
foreach ($stati as $status) {
$person_ids[] = $status->person_id;
application/controllers/Cis/ProfilUpdate.php
+1 -1
View File
@@ -13,7 +13,7 @@ class ProfilUpdate extends Auth_Controller
{
parent::__construct([
'index' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
'show' => ['basis/cis:r'],
'show' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r', 'basis/cis:r'],
'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r']
]);