inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 13:15:43 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into triggers

Browse Source 
# Conflicts:
#	InvenTree/plugin/mixins/__init__.py
This commit is contained in:
Oliver
2022-01-10 20:34:42 +11:00
parent 4ae86c8c14 204f60405e
commit fde2b03172
11 changed files with 298 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/templates/base.html
View File

@@ -6,6 +6,7 @@
{% settings_value 'REPORT_ENABLE_TEST_REPORT' as test_report_enabled %}
{% settings_value "REPORT_ENABLE" as report_enabled %}
{% settings_value "SERVER_RESTART_REQUIRED" as server_restart_required %}
{% inventree_demo_mode as demo_mode %}
<!DOCTYPE html>
<html lang="en">
@@ -90,7 +91,7 @@
{% block alerts %}
<div class='notification-area' id='alerts'>
<!-- Div for displayed alerts -->
{% if server_restart_required %}
{% if server_restart_required and not demo_mode %}
<div id='alert-restart-server' class='alert alert-danger' role='alert'>
<span class='fas fa-server'></span>
<b>{% trans "Server Restart Required" %}</b>