blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ci

Browse Source 
Conflicts:
	composer.json
	system/dbupdate_3.2.php
	vilesci/personen/funktion_det.php
This commit is contained in:
oesi
2016-09-12 17:28:03 +02:00
parent 647cd1e8f9 6353cb5527
commit 6c306b9ab9
40 changed files with 1897 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/pdfExport.php
+1 -1
View File
@@ -304,7 +304,7 @@ elseif(in_array($xsl,array('Inskription','Studienerfolg','OutgoingLearning','Out
}
elseif($xsl=='Uebernahme')
{
if(!$rechte->isBerechtigt('wawi/inventar') && !$rechte->isBerechtigt('assistenz'))
if(!$rechte->isBerechtigt('wawi/inventar') && !$rechte->isBerechtigt('assistenz') && !$rechte->isBerechtigt('basis/betriebsmittel'))
{
echo 'Sie haben keine Berechtigung dieses Dokument zu erstellen';
exit;