Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only check for label printing plugins if plugins are enabled

Browse Source
This commit is contained in:
Oliver Walters 2022-03-28 20:36:34 +11:00
parent 2ce5b7c896
commit 05344a3675
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/version.py
View File

@ -196,7 +196,7 @@ def isInvenTreeUpToDate():
and stores it to the database as INVENTREE_LATEST_VERSION 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! # No record for "latest" version - we must assume we are up to date!
if not latest: if not latest:

3
InvenTree/templates/js/dynamic/settings.js
View File

@ -20,7 +20,8 @@ const global_settings = {
{% endfor %} {% endfor %}
}; };
{% if plugins_enabled %} {% plugins_enabled as p_en %}
{% if p_en %}
const plugins_enabled = true; const plugins_enabled = true;
{% else %} {% else %}
const plugins_enabled = false; const plugins_enabled = false;

35
InvenTree/templates/js/translated/label.js
View File

@ -10,6 +10,7 @@
modalSetTitle, modalSetTitle,
modalSubmit, modalSubmit,
openModal, openModal,
plugins_enabled,
showAlertDialog, showAlertDialog,
*/ */
@ -232,26 +233,28 @@ function selectLabel(labels, items, options={}) {
var plugins = []; var plugins = [];
// Request a list of available label printing plugins from the server // Request a list of available label printing plugins from the server
inventreeGet( if (plugins_enabled) {
`/api/plugin/`, inventreeGet(
{}, `/api/plugin/`,
{ {},
async: false, {
success: function(response) { async: false,
response.forEach(function(plugin) { success: function(response) {
// Look for active plugins which implement the 'labels' mixin class response.forEach(function(plugin) {
if (plugin.active && plugin.mixins && plugin.mixins.labels) { // Look for active plugins which implement the 'labels' mixin class
// This plugin supports label printing if (plugin.active && plugin.mixins && plugin.mixins.labels) {
plugins.push(plugin); // This plugin supports label printing
} plugins.push(plugin);
}); }
});
}
} }
} );
); }
var plugin_selection = ''; var plugin_selection = '';
if (plugins.length > 0) { if (plugins_enabled && plugins.length > 0) {
plugin_selection =` plugin_selection =`
<div class='form-group'> <div class='form-group'>
<label class='control-label requiredField' for='id_plugin'> <label class='control-label requiredField' for='id_plugin'>