Merge branch 'release/v_1.11.9'

gitflow-release-stash: v_1.11.9
show entry deadlines also when already registered
2022-06-27 11:35:34 +02:00 · 2022-06-27 11:35:29 +02:00 · 2022-06-27 11:35:07 +02:00 · 2022-06-27 11:32:57 +02:00
2 changed files with 3 additions and 3 deletions
--- a/server/scripts/onRegattaClicked.js
+++ b/server/scripts/onRegattaClicked.js
@@ -159,10 +159,10 @@ async function onRegattaClicked(id) {
 		$('#menu-item-meldung').show();
 		$('#menu-item-meldung').attr('href', regatta['meldung']);
 		$('#menu-item-meldung').attr('target', '_blank');
-		if ((planning != null) && (planning['gemeldet'] == '1')) {
+		/*if ((planning != null) && (planning['gemeldet'] == '1')) {
 			$('#badge-regatta-meldung').text('schon gemeldet');
 			$('#badge-regatta-meldung').addClass('bg-green2-dark').removeClass('bg-highlight bg-red2-dark bg-yellow2-dark');
-		} else if (regatta['meldungOffen'] == '0') {
+		} else*/ if (regatta['meldungOffen'] == '0') {
 			$('#badge-regatta-meldung').text('geschlossen');
 			$('#badge-regatta-meldung').addClass('bg-highlight').removeClass('bg-green2-dark bg-red2-dark bg-yellow2-dark');
 		} else if (regatta['meldungSchluss'] != null) {
--- a/server/version.php
+++ b/server/version.php
@@ -1,5 +1,5 @@
 <?php
-	define('PWA_VERSION', '1.11.8');
+	define('PWA_VERSION', '1.11.9');
 ?>
Author	SHA1	Message	Date
ostertun	ba09698ece	Merge branch 'release/v_1.11.9'	2022-06-27 11:35:34 +02:00
ostertun	abe412d8ed	gitflow-release-stash: v_1.11.9	2022-06-27 11:35:29 +02:00
ostertun	e25ca534ec	show entry deadlines also when already registered	2022-06-27 11:35:07 +02:00
ostertun	314792b09e	Merge branch 'release/v_1.11.8' into develop	2022-06-27 11:32:57 +02:00