[chore] Bump changes

openwisp · Sep 7, 2024 · 2f802be · 2f802be
1 parent b37fce5
commit 2f802be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/openwisp_notifications/static/openwisp-notifications/js/unsubscribe.js b/openwisp_notifications/static/openwisp-notifications/js/unsubscribe.js
@@ -21,25 +21,30 @@ function updateSubscription(subscribe) {
             if (subscribe) {
                 statusMessage.textContent = gettext('You are currently subscribed to notifications.');
                 toggleBtn.textContent = gettext('Unsubscribe');
-                confirmationMsg.textContent = data.message;
+                toggleBtn.setAttribute('data-hasSubscribe', 'true');
+                confirmationMsg.textContent = 'Successfully subscribed!';
             } else {
                 statusMessage.textContent = gettext('You are currently unsubscribed from notifications.');
                 toggleBtn.textContent = gettext('Subscribe');
-                confirmationMsg.textContent = data.message;
+                toggleBtn.setAttribute('data-hasSubscribe', 'false');
+                confirmationMsg.textContent = 'Successfully unsubscribed!';
             }
 
             confirmationMsg.style.display = 'block';
         } else {
             window.alert(data.message);
         }
+    })
+    .catch(error => {
+        console.error('Error:', error);
     });
 }
 
 document.addEventListener('DOMContentLoaded', function() {
     const toggleBtn = document.getElementById('toggle-btn');
     toggleBtn.addEventListener('click', function() {
-        const currentStatus = toggleBtn.textContent.trim().toLowerCase();
-        const subscribe = currentStatus === gettext('subscribe').toLowerCase();
+        const isSubscribed = toggleBtn.getAttribute('data-hasSubscribe') === 'true';
+        const subscribe = !isSubscribed;
         updateSubscription(subscribe);
     });
 });
diff --git a/openwisp_notifications/templates/openwisp_notifications/unsubscribe.html b/openwisp_notifications/templates/openwisp_notifications/unsubscribe.html
@@ -29,7 +29,7 @@ <h1>{% trans 'Manage Notification Preferences' %}</h1>
               {% trans 'You are currently unsubscribed from notifications.' %}
             {% endif %}
           </p>
-          <button id="toggle-btn">
+          <button id="toggle-btn" data-hasSubscribe="{% if is_subscribed %}true{% else %}false{% endif %}">
             {% if is_subscribed %}
               {% trans 'Unsubscribe' %}
             {% else %}

diff --git a/openwisp_notifications/views.py b/openwisp_notifications/views.py
@@ -94,7 +94,7 @@ def post(self, request, *args, **kwargs):
         try:
             if request.content_type == 'application/json':
                 data = json.loads(request.body)
-                subscribe = data.get('subscribe', False)
+                subscribe = data.get('subscribe', False) is True
             else:
                 # Unsubscribe by default
                 subscribe = False