From 6a5d06325d7bbeb64df22aae99057570b5ec0234 Mon Sep 17 00:00:00 2001
From: ostertun
Date: Fri, 2 Oct 2020 00:13:58 +0200
Subject: [PATCH] RA-#4 Notifications: can select "my regattas" channels only
when logged in
---
client/scripts/regatten.js.php | 13 ++++++++++---
server/page/menus.php | 15 +++++++++------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/client/scripts/regatten.js.php b/client/scripts/regatten.js.php
index 9b5fd0e..2fc05f0 100644
--- a/client/scripts/regatten.js.php
+++ b/client/scripts/regatten.js.php
@@ -342,10 +342,16 @@ async function updatePushSwitches() {
if ($('#switch-pushes').prop('checked')) {
$('#p-pushes-info').show();
- $('.a-switch-pushes-channel').show();
+ $('.a-switch-pushes-channel-all').show();
+ $('.a-switch-pushes-channel-my').show();
+ if (!isLoggedIn()) {
+ $('.a-switch-pushes-channel-my').find('div').remove();
+ $('.a-switch-pushes-channel-my').find('.badge').text('nicht angemeldet');
+ }
} else {
$('#p-pushes-info').hide();
- $('.a-switch-pushes-channel').hide();
+ $('.a-switch-pushes-channel-all').hide();
+ $('.a-switch-pushes-channel-my').hide();
}
}
@@ -421,7 +427,8 @@ var initRegatten = function() {
// Pushes
$('#a-switch-pushes').click(pushesSubscribeClicked);
- $('.a-switch-pushes-channel').click(pushesChannelClicked);
+ $('.a-switch-pushes-channel-all').click(pushesChannelClicked);
+ $('.a-switch-pushes-channel-my').click(pushesChannelClicked);
}
var onServiceWorkerLoaded = function() {
diff --git a/server/page/menus.php b/server/page/menus.php
index 7a642a7..ff88dde 100644
--- a/server/page/menus.php
+++ b/server/page/menus.php
@@ -154,7 +154,7 @@
(meine) bezieht sich auf die Regatten, die in Deiner Saison-Planung sind,
(alle) informiert Dich über alle Regatten
-
+
Neuigkeiten
@@ -162,15 +162,16 @@
-
+
Regatta verschoben (meine)
+
-
+
Regatta verschoben (alle)
@@ -178,15 +179,16 @@
-
+
Ergebnisse verfügbar (meine)
+
-
+
Ergebnisse verfügbar (alle)
@@ -194,9 +196,10 @@
-
+
Melde-Erinnerungen
+