diff --git a/demo/demodesk/config/settings.py b/demo/demodesk/config/settings.py index b672dfc4..e1ac8106 100644 --- a/demo/demodesk/config/settings.py +++ b/demo/demodesk/config/settings.py @@ -106,9 +106,6 @@ HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT = False LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = '/login/' -# Turn off server-side processing for this local demo -HELPDESK_USE_SERVERSIDE_PROCESSING = False - # Database # - by default, we use SQLite3 for the demo, but you can also # configure MySQL or PostgreSQL, see the docs for more: diff --git a/docs/settings.rst b/docs/settings.rst index 72792849..0502f0e2 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -90,11 +90,6 @@ These changes are visible throughout django-helpdesk **Default:** ``HELPDESK_ANON_ACCESS_RAISES_404 = False`` -- **HELPDESK_USE_SERVERSIDE_PROCESSING** If True, may improve performance by utilizing server-side processing of the full ticket list whenever performing queries on the ticket list. Set to False to restore the "classic" functionality using javascript. - - **Default:** ``HELPDESK_USE_SERVERSIDE_PROCESSING = True`` - - Options shown on public pages ----------------------------- diff --git a/helpdesk/settings.py b/helpdesk/settings.py index 7142ce18..32afacc6 100644 --- a/helpdesk/settings.py +++ b/helpdesk/settings.py @@ -151,7 +151,3 @@ HELPDESK_ENABLE_PER_QUEUE_STAFF_PERMISSION = getattr( # use https in the email links HELPDESK_USE_HTTPS_IN_EMAIL_LINK = getattr(settings, 'HELPDESK_USE_HTTPS_IN_EMAIL_LINK', False) - -# Asynchronous Datatables - Optional -HELPDESK_USE_SERVERSIDE_PROCESSING = getattr( - settings, 'HELPDESK_USE_SERVERSIDE_PROCESSING', True) diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index 0da85099..3a3a0b20 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -185,9 +185,6 @@ {% trans "Time Spent" %} - {% if not server_side %} - {% include 'helpdesk/ticket_list_table.html' %} - {% endif %}

@@ -229,135 +226,126 @@ {% block helpdesk_js %}