From b0e6b6071fa96f28ee05b783afd0e341b1067633 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Sun, 20 Mar 2022 00:29:58 +0100
Subject: [PATCH] make requeseted changes from code review

---
 InvenTree/InvenTree/static/script/inventree/inventree.js | 4 ++--
 InvenTree/InvenTree/views.py                             | 8 --------
 InvenTree/templates/InvenTree/notifications/history.html | 6 +++---
 InvenTree/templates/InvenTree/notifications/inbox.html   | 6 +++---
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/InvenTree/InvenTree/static/script/inventree/inventree.js b/InvenTree/InvenTree/static/script/inventree/inventree.js
index c69dd8df07..d1b49aaf4b 100644
--- a/InvenTree/InvenTree/static/script/inventree/inventree.js
+++ b/InvenTree/InvenTree/static/script/inventree/inventree.js
@@ -231,8 +231,8 @@ function inventreeDocReady() {
         stopNotificationWatcher();
     });
 
-    $('#offcanvasRight').on('show.bs.offcanvas', openNotificationPanel)  // listener for opening the notification panel
-    $('#offcanvasRight').on('hidden.bs.offcanvas', closeNotificationPanel)  // listener for closing the notification panel
+    $('#offcanvasRight').on('show.bs.offcanvas', openNotificationPanel);  // listener for opening the notification panel
+    $('#offcanvasRight').on('hidden.bs.offcanvas', closeNotificationPanel);  // listener for closing the notification panel
 }
 
 
diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py
index 77d4a56c16..feb586c844 100644
--- a/InvenTree/InvenTree/views.py
+++ b/InvenTree/InvenTree/views.py
@@ -911,11 +911,3 @@ class NotificationsView(TemplateView):
     """
 
     template_name = "InvenTree/notifications/notifications.html"
-
-    def get_context_data(self, **kwargs):
-
-        ctx = super().get_context_data(**kwargs).copy()
-
-        # ctx['settings'] = InvenTreeSetting.objects.all().order_by('key')
-
-        return ctx
diff --git a/InvenTree/templates/InvenTree/notifications/history.html b/InvenTree/templates/InvenTree/notifications/history.html
index a3c4ffdc0e..863c797d1f 100644
--- a/InvenTree/templates/InvenTree/notifications/history.html
+++ b/InvenTree/templates/InvenTree/notifications/history.html
@@ -6,12 +6,12 @@
 {% block label %}history{% endblock %}
 
 {% block heading %}
-{% trans "History" %}
+{% trans "Notification History" %}
 {% endblock %}
 
 {% block actions %}
-<div class='btn btn-secondary' type='button' id='history-refresh' title='{% trans "Refresh History" %}'>
-    <span class='fa fa-sync'></span> {% trans "Refresh History" %}
+<div class='btn btn-secondary' type='button' id='history-refresh' title='{% trans "Refresh Notification History" %}'>
+    <span class='fa fa-sync'></span> {% trans "Refresh Notification History" %}
 </div>
 {% endblock %}
 
diff --git a/InvenTree/templates/InvenTree/notifications/inbox.html b/InvenTree/templates/InvenTree/notifications/inbox.html
index 92c4a56339..b50001b107 100644
--- a/InvenTree/templates/InvenTree/notifications/inbox.html
+++ b/InvenTree/templates/InvenTree/notifications/inbox.html
@@ -6,12 +6,12 @@
 {% block label %}inbox{% endblock %}
 
 {% block heading %}
-{% trans "Inbox" %}
+{% trans "Pending Notifications" %}
 {% endblock %}
 
 {% block actions %}
-<div class='btn btn-secondary' type='button' id='inbox-refresh' title='{% trans "Refresh Inbox" %}'>
-    <span class='fa fa-sync'></span> {% trans "Refresh Inbox" %}
+<div class='btn btn-secondary' type='button' id='inbox-refresh' title='{% trans "Refresh Pending Notifications" %}'>
+    <span class='fa fa-sync'></span> {% trans "Refresh Pending Notifications" %}
 </div>
 {% endblock %}