Notificaties zien zonder login #921

Author: dennissiemensma

docs/changelog.rst

@@ -5,7 +5,7 @@ Changelog
 v3.7.0 - 2020-xx-xx
 
 - [`#919 <https://github.com/dennissiemensma/dsmr-reader/issues/919>`_] Parsing telegram 3-fasige Fluvius meter faalt
-- [`#xxxxxxxxxx <https://github.com/dennissiemensma/dsmr-reader/issues/xxxxxxxxxx>`_] xxxxxxxxxx
+- [`#921 <https://github.com/dennissiemensma/dsmr-reader/issues/921>`_] Notificaties bekijken zonder login #921
 
 
 ----

dsmr_frontend/templates/dsmr_frontend/notifications.html

@@ -17,25 +17,30 @@
                 <header class="panel-heading">
                     {% trans "Unread Notifications" %}
                     &nbsp;
-                    {% if notifications %}
-                        <div class="pull-right">
+                    <div class="pull-right">
+                        {% if notifications and user.is_authenticated %}
                             <button class="btn btn-sm btn-success mark-all-notifications-read" data-notification-id="{{ current_notification.pk }}" title="{% trans 'Mark all notifications as read' %}">
                                 <i class="fas fa-check-double"></i> {% trans 'Mark all as read' %}
                             </button>
-                        </div>
-                    {% endif %}
+                        {% else %}
+                            <a class="btn btn-sm btn-primary"  href="{% url 'admin:login' %}?next={% url 'frontend:notifications' %}">
+                                <i class="fas fa-lock"></i> &nbsp; {% trans 'Login to mark as read' %}
+                            </a>
+                        {% endif %}
+                    </div>
                 </header>
                 <div class="panel-body">
                     {% if notifications %}
                         {% for current_notification in notifications %}
                         <div class="alert alert-info" role="alert">
+                            {% if user.is_authenticated %}
                             <button class="btn btn-sm btn-success mark-notification-read" data-notification-id="{{ current_notification.pk }}" title="{% trans 'Mark as read' %}">
                                 <i class="fas fa-check"></i>
                             </button>
-                            &nbsp;
+                            &nbsp{% endif %}
 
                             {% if current_notification.redirect_to %}
-                            <a class="btn btn-sm btn-primary" href="{% url current_notification.redirect_to %}" title="{% trans "View page" %}"><i class="fas fa-external-link-alt"></i></a>
+                            <a class="btn btn-sm btn-primary" href="{% url current_notification.redirect_to %}" title="{% trans "View page" %}"><i class="fas fa-external-link-alt"></i></a> &nbsp; 
                             {% endif %}
 
                             {{ current_notification.message }}

dsmr_frontend/tests/webinterface/test_notifications.py

@@ -18,15 +18,6 @@ def setUp(self):
     def test_notifications(self):
         view_url = reverse('{}:notifications'.format(self.namespace))
 
-        # Check login required.
-        response = self.client.get(view_url)
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(
-            response['Location'], '/admin/login/?next={}'.format(view_url)
-        )
-
-        # Logged in.
-        self.client.login(username='testuser', password='passwd')
         response = self.client.get(view_url)
         self.assertEqual(response.status_code, 200, response.content)
         self.assertIn('notifications', response.context)

dsmr_frontend/urls.py

@@ -45,6 +45,8 @@
     path('status', Status.as_view(), name='status'),
     path('status/xhr/check-for-updates', XhrUpdateChecker.as_view(), name='status-xhr-check-for-updates'),
 
+    path('notifications', Notifications.as_view(), name='notifications'),
+
     # Docs.
     path('docs/api', ApiDocs.as_view(), name='api-docs'),
 
@@ -58,7 +60,6 @@
     path('configuration', Configuration.as_view(), name='configuration'),
     path('export', Export.as_view(), name='export'),
     path('export/csv', ExportAsCsv.as_view(), name='export-as-csv'),
-    path('notifications', Notifications.as_view(), name='notifications'),
     path('notifications/xhr/mark-read', XhrMarkNotificationRead.as_view(), name='notification-xhr-mark-read'),
     path(
         'notifications/xhr/mark-all-read',

dsmr_frontend/views/notifications.py

@@ -9,7 +9,7 @@
 from dsmr_frontend.models.message import Notification
 
 
-class Notifications(LoginRequiredMixin, TemplateView):
+class Notifications(TemplateView):
     template_name = 'dsmr_frontend/notifications.html'
 
     def get_context_data(self, **kwargs):

dsmrreader/locales/nl/LC_MESSAGES/django.mo

@@ -1330,6 +1330,9 @@ msgstr "Markeer alle notificaties als gelezen"
 msgid "Mark all as read"
 msgstr "Markeer allemaal als gelezen"
 
+msgid "Login to mark as read"
+msgstr "Log in om te markeren als gelezen"
+
 msgid "Mark as read"
 msgstr "Markeer als gelezen"