mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
Fixed broken group search
This commit is contained in:
@@ -48,7 +48,7 @@ if ($studiengang_kz != '')
|
||||
$oe_studiengang = '';
|
||||
}
|
||||
|
||||
if (isset($_GET['searchItems']))
|
||||
if (isset($_GET['searchItems']) && trim($_GET['searchItems']) != '')
|
||||
{
|
||||
$searchItems = explode(' ', trim($_GET['searchItems']));
|
||||
}
|
||||
@@ -82,12 +82,12 @@ if(!$rechte->isBerechtigt('lehre/gruppe', null, 's'))
|
||||
<title>Gruppe-Verwaltung</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
|
||||
|
||||
<?php
|
||||
|
||||
<?php
|
||||
include('../../include/meta/jquery.php');
|
||||
include('../../include/meta/jquery-tablesorter.php');
|
||||
?>
|
||||
|
||||
|
||||
<script language="JavaScript" type="text/javascript">
|
||||
function conf_del()
|
||||
{
|
||||
@@ -114,7 +114,7 @@ if(!$rechte->isBerechtigt('lehre/gruppe', null, 's'))
|
||||
$( "#domain_text" ).toggle();
|
||||
$('#gesperrt').prop('disabled', function(i, v) { return !v; });
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
@@ -155,22 +155,22 @@ else if (isset($_POST['type']) && $_POST['type']=='save')
|
||||
else if (isset($_GET['type']) && $_GET['type']=='delete')
|
||||
{
|
||||
printDropDown();
|
||||
|
||||
|
||||
if($rechte->isBerechtigt('lehre/gruppe', $oe_studiengang, 'suid'))
|
||||
{
|
||||
$e=new gruppe();
|
||||
if(!$e->delete($_GET['einheit_id']))
|
||||
echo $e->errormsg;
|
||||
}
|
||||
else
|
||||
else
|
||||
echo '<span class="error">'.$rechte->errormsg.'</span>';
|
||||
|
||||
|
||||
getUebersicht();
|
||||
}
|
||||
else
|
||||
{
|
||||
printDropDown();
|
||||
if ($studiengang_kz != '')
|
||||
if ($studiengang_kz != '' || count($searchItems) > 0)
|
||||
getUebersicht();
|
||||
}
|
||||
|
||||
@@ -217,17 +217,17 @@ function printDropDown()
|
||||
function doSave()
|
||||
{
|
||||
global $rechte;
|
||||
|
||||
|
||||
$studiengang = new studiengang($_POST['studiengang_kz']);
|
||||
if ($studiengang->oe_kurzbz != '')
|
||||
$oe_studiengang = $studiengang->oe_kurzbz;
|
||||
else
|
||||
$oe_studiengang = '';
|
||||
|
||||
|
||||
if($rechte->isBerechtigt('lehre/gruppe', $oe_studiengang, 'sui'))
|
||||
{
|
||||
$e = new gruppe();
|
||||
|
||||
|
||||
if ($_POST['new']=='true')
|
||||
{
|
||||
$e->new = true;
|
||||
@@ -240,7 +240,7 @@ function doSave()
|
||||
$e->load($_POST['kurzbz']);
|
||||
$e->new = false;
|
||||
}
|
||||
|
||||
|
||||
$e->updateamum = date('Y-m-d H:i:s');
|
||||
$e->updatevon = get_uid();
|
||||
$e->bezeichnung = $_POST['bezeichnung'];
|
||||
@@ -257,7 +257,7 @@ function doSave()
|
||||
$e->aufnahmegruppe = isset($_POST['aufnahmegruppe']);
|
||||
$e->sort = $_POST['sort'];
|
||||
$e->content_visible = isset($_POST['content_visible']);
|
||||
|
||||
|
||||
if(!$e->save())
|
||||
echo $e->errormsg;
|
||||
}
|
||||
@@ -331,7 +331,7 @@ function doEdit($kurzbz,$new=false)
|
||||
$selected = 'selected="selected"';
|
||||
else
|
||||
$selected='';
|
||||
|
||||
|
||||
echo '<option value="'.$studiengang->studiengang_kz.'" '.$selected.'>'.$db->convert_html_chars($studiengang->kuerzel.' - '.$studiengang->bezeichnung).'</option>';
|
||||
$typ = $studiengang->typ;
|
||||
}
|
||||
@@ -426,7 +426,7 @@ function getUebersicht()
|
||||
|
||||
$gruppe=new gruppe();
|
||||
// Wenn $searchstring gesetz ist, nach gruppe suchen, sonst gruppe mit $studiengang_kz un $semester laden
|
||||
if (!empty($searchItems))
|
||||
if (count($searchItems) > 0)
|
||||
{
|
||||
$gruppe->searchGruppen($searchItems, null, null);
|
||||
}
|
||||
@@ -434,8 +434,6 @@ function getUebersicht()
|
||||
{
|
||||
$gruppe->getgruppe($studiengang_kz,$semester);
|
||||
}
|
||||
// Array mit allen Einheiten holen
|
||||
|
||||
|
||||
echo '<h3>Übersicht</h3>';
|
||||
echo '<button type="button" class="resetsaved" title="Reset Filter">Reset Filter</button>';
|
||||
@@ -489,13 +487,13 @@ function getUebersicht()
|
||||
// src="../../skin/images/'.($row->projektarbeit=='t'?'true.png':'false.png').'"
|
||||
//echo "<td>".$gruppe->countStudenten($e->gruppe_kurzbz)."</td>"; Auskommentiert, da sonst die Ladezeit der Seite zu lange ist
|
||||
echo "<td style='padding-right: 5px'><a href='einheit_det.php?kurzbz=$e->gruppe_kurzbz'>Personen</a></td>";
|
||||
|
||||
|
||||
if($rechte->isBerechtigt('lehre/gruppe', $oe_studiengang, 'su'))
|
||||
echo "<td style='padding-right: 5px'><a href=\"einheit_menu.php?edit=1&kurzbz=$e->gruppe_kurzbz\">Edit</a></td>";
|
||||
|
||||
|
||||
if($rechte->isBerechtigt('lehre/gruppe', $oe_studiengang, 'suid'))
|
||||
echo "<td><a href=\"einheit_menu.php?einheit_id=$e->gruppe_kurzbz&studiengang_kz=$e->studiengang_kz&type=delete\" onclick='return conf_del()'>Delete</a></td>";
|
||||
|
||||
|
||||
echo "</tr>\n";
|
||||
}
|
||||
|
||||
@@ -504,4 +502,4 @@ function getUebersicht()
|
||||
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user