Merge branch 'sportsmanager2-dev' into sportsmanager2-issue165

This commit is contained in:
MarvinF
2025-09-04 21:07:37 +02:00
committed by GitHub
2 changed files with 7 additions and 3 deletions
@@ -10306,7 +10306,7 @@ function adminBegegnungenExportForm(): void
$db = getDatabase();
$jInput = Factory::getContainer()->get(SiteApplication::class)->input;
$veranstaltungId = $jInput->get('veranstaltungid', 0, 'INT');
$veranstaltungId = $jInput->get('veranstaltungId', 0, 'INT');
$export = $jInput->get('export', '', 'RAW');
if ($veranstaltungId == 0) die("Missing id!");
@@ -14157,8 +14157,7 @@ function adminTermine($admin_uebersicht): void
$query = "SELECT land"
. "\n FROM #__sportsmanager_termin"
. "\n INNER JOIN #__sportsmanager_termin_aktion USING (termin_id)"
. "\n INNER JOIN (SELECT land FROM #__sportsmanager_termin_land UNION SELECT bundesland AS land FROM #__sportsmanager_termin_bundesland) AS land_bundesland USING (land)"
. "\n WHERE YEAR(erster_tag) = '$filter_jahr' AND status = 0 AND (typ = 0 OR typ = 1)"
. "\n WHERE YEAR(erster_tag) = '$filter_jahr' AND status = 0 AND (typ = 0 OR typ = 1) AND land <> ''"
. "\n GROUP BY land"
. "\n ORDER BY land";
$laender = loadObjectList($db, $query);