kickern/com_sportsmanager
1
0
Fork 0
mirror of https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git synced 2026-06-10 06:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sportsmanager2-dev' into sportsmanager2-issue165

Browse Source
This commit is contained in:
MarvinF
2025-09-04 21:07:37 +02:00
committed by GitHub
parent 1ddcfd87db cb1493954f
commit 1c380928f0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_release.yml
+5
View File
@@ -28,6 +28,9 @@ jobs:
- name: Get version from git tag - name: Get version from git tag
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
- name: Set DATE
run: echo "DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Update version.php - name: Update version.php
run: | run: |
echo "<?php" > src/structure/components/com_sportsmanager/util/version.php echo "<?php" > src/structure/components/com_sportsmanager/util/version.php
@@ -38,6 +41,8 @@ jobs:
echo "];" >> src/structure/components/com_sportsmanager/util/version.php echo "];" >> src/structure/components/com_sportsmanager/util/version.php
echo "Updating version to $VERSION in sportsmanager.xml" echo "Updating version to $VERSION in sportsmanager.xml"
sed -i "s#<version>.*</version>#<version>$VERSION</version>#" src/structure/sportsmanager.xml sed -i "s#<version>.*</version>#<version>$VERSION</version>#" src/structure/sportsmanager.xml
echo "Updating Date to $DATE in sportsmanager.xml"
sed -i "s#<creationDate>.*</creationDate>#<creationDate>$DATE</creationDate>#" src/structure/sportsmanager.xml
- name: Generate release notes - name: Generate release notes
id: release_notes_extension id: release_notes_extension
src/structure/components/com_sportsmanager/admin.php
+2 -3
View File
@@ -10306,7 +10306,7 @@ function adminBegegnungenExportForm(): void
$db = getDatabase(); $db = getDatabase();
$jInput = Factory::getContainer()->get(SiteApplication::class)->input; $jInput = Factory::getContainer()->get(SiteApplication::class)->input;
$veranstaltungId = $jInput->get('veranstaltungid', 0, 'INT'); $veranstaltungId = $jInput->get('veranstaltungId', 0, 'INT');
$export = $jInput->get('export', '', 'RAW'); $export = $jInput->get('export', '', 'RAW');
if ($veranstaltungId == 0) die("Missing id!"); if ($veranstaltungId == 0) die("Missing id!");
@@ -14157,8 +14157,7 @@ function adminTermine($admin_uebersicht): void
$query = "SELECT land" $query = "SELECT land"
. "\n FROM #__sportsmanager_termin" . "\n FROM #__sportsmanager_termin"
. "\n INNER JOIN #__sportsmanager_termin_aktion USING (termin_id)" . "\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) AND land <> ''"
. "\n WHERE YEAR(erster_tag) = '$filter_jahr' AND status = 0 AND (typ = 0 OR typ = 1)"
. "\n GROUP BY land" . "\n GROUP BY land"
. "\n ORDER BY land"; . "\n ORDER BY land";
$laender = loadObjectList($db, $query); $laender = loadObjectList($db, $query);