diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py index f97f134e4a..8d9b0e8da1 100644 --- a/InvenTree/InvenTree/version.py +++ b/InvenTree/InvenTree/version.py @@ -196,7 +196,7 @@ def isInvenTreeUpToDate(): and stores it to the database as INVENTREE_LATEST_VERSION """ - latest = common.models.InvenTreeSetting.get_setting('INVENTREE_LATEST_VERSION', None) + latest = common.models.InvenTreeSetting.get_setting('INVENTREE_LATEST_VERSION', backup_value=None, create=False) # No record for "latest" version - we must assume we are up to date! if not latest: diff --git a/InvenTree/templates/js/dynamic/settings.js b/InvenTree/templates/js/dynamic/settings.js index 4dd6f8c6e6..79c0d3e213 100644 --- a/InvenTree/templates/js/dynamic/settings.js +++ b/InvenTree/templates/js/dynamic/settings.js @@ -20,7 +20,8 @@ const global_settings = { {% endfor %} }; -{% if plugins_enabled %} +{% plugins_enabled as p_en %} +{% if p_en %} const plugins_enabled = true; {% else %} const plugins_enabled = false; diff --git a/InvenTree/templates/js/translated/label.js b/InvenTree/templates/js/translated/label.js index c0f4c2f735..d19c403861 100644 --- a/InvenTree/templates/js/translated/label.js +++ b/InvenTree/templates/js/translated/label.js @@ -10,6 +10,7 @@ modalSetTitle, modalSubmit, openModal, + plugins_enabled, showAlertDialog, */ @@ -232,26 +233,28 @@ function selectLabel(labels, items, options={}) { var plugins = []; // Request a list of available label printing plugins from the server - inventreeGet( - `/api/plugin/`, - {}, - { - async: false, - success: function(response) { - response.forEach(function(plugin) { - // Look for active plugins which implement the 'labels' mixin class - if (plugin.active && plugin.mixins && plugin.mixins.labels) { - // This plugin supports label printing - plugins.push(plugin); - } - }); + if (plugins_enabled) { + inventreeGet( + `/api/plugin/`, + {}, + { + async: false, + success: function(response) { + response.forEach(function(plugin) { + // Look for active plugins which implement the 'labels' mixin class + if (plugin.active && plugin.mixins && plugin.mixins.labels) { + // This plugin supports label printing + plugins.push(plugin); + } + }); + } } - } - ); + ); + } var plugin_selection = ''; - if (plugins.length > 0) { + if (plugins_enabled && plugins.length > 0) { plugin_selection =`