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

Merge branch 'master' into cleanjs

Browse Source
This commit is contained in:
Paolo
2017-09-14 14:40:28 +02:00
parent aedaf05735 46142f80cd
commit 2b4a736a0e
10 changed files with 624 additions and 1239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lehrstunde.class.php
+1 -1
View File
@@ -516,7 +516,7 @@ class lehrstunde extends basis_db
}
// Reservierungsdaten ermitteln
if ($type!='idList' && $type!='fachbereich')
if ($type!='idList' && $type!='fachbereich' && $type!='lva')
{
// Datenbankabfrage generieren
$sql_query_reservierung='SELECT * FROM campus.vw_reservierung';
include/tw/vilesci_menu_main.inc.php
+1
View File
@@ -171,6 +171,7 @@ $menu=array
'Kartenausgabe'=>array('name'=>'Kartenausgabe','link'=>'fhausweis/kartenausgabe.php','target'=>'main'),
'Verlaengerung'=>array('name'=>'Verlängerung','link'=>'fhausweis/verlaengerung.php','target'=>'main'),
'Suche'=>array('name'=>'Suche','link'=>'fhausweis/search.php','target'=>'main'),
'Kartenruecknahme'=>array('name'=>'Kartenruecknahme','link'=>'fhausweis/kartenruecknahme.php','target'=>'main'),
)
),
'Wartung'=> array
include/wochenplan.class.php
+1 -1
View File
@@ -909,7 +909,7 @@ class wochenplan extends basis_db
echo '<img src="../../../skin/images/sticky.png" tooltip="'.$this->convert_html_chars($uEinheit['titel'][0]).'"/>';
}
echo '<BR />';
if ($this->type=='ort' || $this->type=='lektor' || $this->type=='verband')
if ($this->type=='ort' || $this->type=='lektor' || $this->type=='verband' || $this->type=='lva')
{
$uEinheit['lehrverband']=array_unique($uEinheit['lehrverband']);
foreach($uEinheit['lehrverband'] as $ueLehrverband)