Merge pull request #2325 from SchrodingersGat/demo-enhancemenets

Demo enhancements

InvenTree/InvenTree/settings.py

@@ -92,6 +92,12 @@ DEBUG = _is_true(get_setting(
     CONFIG.get('debug', True)
 ))
 
+# Determine if we are running in "demo mode"
+DEMO_MODE = _is_true(get_setting(
+    'INVENTREE_DEMO',
+    CONFIG.get('demo', False)
+))
+
 DOCKER = _is_true(get_setting(
     'INVENTREE_DOCKER',
     False
@@ -234,7 +240,10 @@ STATIC_COLOR_THEMES_DIR = os.path.join(STATIC_ROOT, 'css', 'color-themes')
 MEDIA_URL = '/media/'
 
 if DEBUG:
-    logger.info("InvenTree running in DEBUG mode")
+    logger.info("InvenTree running with DEBUG enabled")
+
+if DEMO_MODE:
+    logger.warning("InvenTree running in DEMO mode")
 
 logger.debug(f"MEDIA_ROOT: '{MEDIA_ROOT}'")
 logger.debug(f"STATIC_ROOT: '{STATIC_ROOT}'")

InvenTree/InvenTree/utils.py

@@ -1,13 +0,0 @@
-from rest_framework.views import exception_handler
-
-
-def api_exception_handler(exc, context):
-    response = exception_handler(exc, context)
-
-    # Now add the HTTP status code to the response.
-    if response is not None:
-
-        data = {'error': response.data}
-        response.data = data
-
-    return response

InvenTree/part/templatetags/inventree_extras.py

@@ -90,6 +90,13 @@ def inventree_in_debug_mode(*args, **kwargs):
     return djangosettings.DEBUG
 
 
+@register.simple_tag()
+def inventree_demo_mode(*args, **kwargs):
+    """ Return True if the server is running in DEMO mode """
+
+    return djangosettings.DEMO_MODE
+
+
 @register.simple_tag()
 def inventree_docker_mode(*args, **kwargs):
     """ Return True if the server is running as a Docker image """

InvenTree/templates/InvenTree/settings/user.html

@@ -12,12 +12,15 @@
 {% endblock %}
 
 {% block actions %}
+{% inventree_demo_mode as demo %}
+{% if not demo %}
 <div class='btn btn-primary' type='button' id='edit-user' title='{% trans "Edit User Information" %}'>
     <span class='fas fa-user-cog'></span> {% trans "Edit" %}
 </div>
 <div class='btn btn-primary' type='button' id='edit-password' title='{% trans "Change Password" %}'>
     <span class='fas fa-key'></span> {% trans "Set Password" %}
 </div>
+{% endif %}
 {% endblock %}
 
 {% block content %}

InvenTree/templates/account/login.html

@@ -1,5 +1,6 @@
 {% extends "account/base.html" %}
 
+{% load inventree_extras %}
 {% load i18n account socialaccount crispy_forms_tags inventree_extras %}
 
 {% block head_title %}{% trans "Sign In" %}{% endblock %}
@@ -10,6 +11,7 @@
 {% settings_value 'LOGIN_ENABLE_PWD_FORGOT' as enable_pwd_forgot %}
 {% settings_value 'LOGIN_ENABLE_SSO' as enable_sso %}
 {% mail_configured as mail_conf %}
+{% inventree_demo_mode as demo %}
 
 <h1>{% trans "Sign In" %}</h1>
 
@@ -36,9 +38,16 @@ for a account and sign in below:{% endblocktrans %}</p>
   <div class="btn-group float-right" role="group">
     <button class="btn btn-success" type="submit">{% trans "Sign In" %}</button>
   </div>
-  {% if mail_conf and enable_pwd_forgot %}
+  {% if mail_conf and enable_pwd_forgot and not demo %}
   <a class="" href="{% url 'account_reset_password' %}"><small>{% trans "Forgot Password?" %}</small></a>
   {% endif %}
+  {% if demo %}
+  <p>
+    <h6>
+      {% trans "InvenTree demo instance" %} - <a href='https://inventree.readthedocs.io/en/latest/demo/'>{% trans "Click here for login details" %}</a>
+    </h6>
+  </p>
+  {% endif %}
 </form>
 
 {% if enable_sso %}

InvenTree/templates/base.html

@@ -86,25 +86,20 @@
             </div>
         </div>
         <main class='col ps-md-2 pt-2 pe-2'>
-
-            {% if server_restart_required %}
-            <div class='notification-area' id='restart-required'>
+            
+            {% block alerts %}
+            <div class='notification-area' id='alerts'>
+                <!-- Div for displayed alerts -->
+                {% if server_restart_required %}
                 <div id='alert-restart-server' class='alert alert-danger' role='alert'>
                     <span class='fas fa-server'></span>
                     <b>{% trans "Server Restart Required" %}</b>
                     <small>
                         <br>
-                        {% trans "A configuration option has been changed which requires a server restart" %}.
-                        <br>
-                        {% trans "Contact your system administrator for further information" %}
+                        {% trans "A configuration option has been changed which requires a server restart" %}. {% trans "Contact your system administrator for further information" %}
                     </small>
                 </div>
-            </div>
-            {% endif %}
-
-            {% block alerts %}
-            <div class='notification-area' id='alerts'>
-                <!-- Div for displayed alerts -->
+                {% endif %}
             </div>
             {% endblock %}
 

InvenTree/templates/navbar.html

@@ -4,6 +4,7 @@
 
 {% settings_value 'BARCODE_ENABLE' as barcodes %}
 {% settings_value 'STICKY_HEADER' user=request.user as sticky %}
+{% inventree_demo_mode as demo %}
 
 <nav class="navbar {% if sticky %}fixed-top{% endif %} navbar-expand-lg navbar-light">
   <div class="container-fluid">
@@ -58,6 +59,9 @@
         {% endif %}
       </ul>
     </div>
+    {% if demo %}
+    {% include "navbar_demo.html" %}
+    {% endif %}
     {% include "search_form.html" %}
     <ul class='navbar-nav flex-row'>
       {% if barcodes %}
@@ -78,7 +82,7 @@
         </a>
         <ul class='dropdown-menu dropdown-menu-end inventree-navbar-menu'>
           {% if user.is_authenticated %}
-          {% if user.is_staff %}
+          {% if user.is_staff and not demo %}
           <li><a class='dropdown-item' href="/admin/"><span class="fas fa-user"></span> {% trans "Admin" %}</a></li>
           {% endif %}
           <li><a class='dropdown-item' href="{% url 'account_logout' %}"><span class="fas fa-sign-out-alt"></span> {% trans "Logout" %}</a></li>

InvenTree/templates/navbar_demo.html

@@ -0,0 +1,12 @@
+{% load i18n %}
+{% include "spacer.html" %}
+<div class='flex'>
+  <h6>
+    {% trans "InvenTree demo mode" %}
+    <a href='https://inventree.readthedocs.io/en/latest/demo/'>
+      <span class='fas fa-info-circle'></span>
+    </a>
+  </h6>
+</div>
+{% include "spacer.html" %}
+{% include "spacer.html" %}