inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 15:15:42 +00:00
Code Activity

make requeseted changes from code review

Browse Source
This commit is contained in:
Matthias
2022-03-20 00:29:58 +01:00
parent 62a81c1a62
commit b0e6b6071f
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/static/script/inventree/inventree.js
View File

@@ -231,8 +231,8 @@ function inventreeDocReady() {
stopNotificationWatcher(); stopNotificationWatcher();
}); });
$('#offcanvasRight').on('show.bs.offcanvas', openNotificationPanel) // listener for opening 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 $('#offcanvasRight').on('hidden.bs.offcanvas', closeNotificationPanel); // listener for closing the notification panel
} }

8
InvenTree/InvenTree/views.py
View File

@@ -911,11 +911,3 @@ class NotificationsView(TemplateView):
""" """
template_name = "InvenTree/notifications/notifications.html" 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

6
InvenTree/templates/InvenTree/notifications/history.html
View File

@@ -6,12 +6,12 @@
{% block label %}history{% endblock %} {% block label %}history{% endblock %}
{% block heading %} {% block heading %}
{% trans "History" %} {% trans "Notification History" %}
{% endblock %} {% endblock %}
{% block actions %} {% block actions %}
<div class='btn btn-secondary' type='button' id='history-refresh' title='{% 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 History" %} <span class='fa fa-sync'></span> {% trans "Refresh Notification History" %}
</div> </div>
{% endblock %} {% endblock %}

6
InvenTree/templates/InvenTree/notifications/inbox.html
View File

@@ -6,12 +6,12 @@
{% block label %}inbox{% endblock %} {% block label %}inbox{% endblock %}
{% block heading %} {% block heading %}
{% trans "Inbox" %} {% trans "Pending Notifications" %}
{% endblock %} {% endblock %}
{% block actions %} {% block actions %}
<div class='btn btn-secondary' type='button' id='inbox-refresh' title='{% 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 Inbox" %} <span class='fa fa-sync'></span> {% trans "Refresh Pending Notifications" %}
</div> </div>
{% endblock %} {% endblock %}