Merge remote-tracking branch 'inventree/master'

This commit is contained in:
Oliver Walters 2022-07-28 08:23:34 +10:00
commit 1f1a4d85fd
28 changed files with 11817 additions and 11714 deletions

View File

@ -110,7 +110,7 @@ function inventreeDocReady() {
launchModalForm(`/about/`, {
no_post: true,
after_render: function() {
attachClipboard('.clip-btn', 'modal-form');
attachClipboard('.clip-btn', 'modal-form', 'about-copy-text');
}
});
});
@ -122,9 +122,6 @@ function inventreeDocReady() {
});
});
// Initialize clipboard-buttons
attachClipboard('.clip-btn');
// Generate brand-icons
$('.brand-icon').each(function(i, obj) {
loadBrandIcon($(this), $(this).attr('brand_name'));

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -252,7 +252,8 @@ class PluginsRegistry:
# If a "path" is provided, some special handling is required
if parent_obj.name is not plugin and len(parent_obj.parts) > 1:
parent_path = parent_obj.parent
# Ensure PosixPath object is converted to a string, before passing to get_plugins
parent_path = str(parent_obj.parent)
plugin = parent_obj.name
modules = get_plugins(importlib.import_module(plugin), InvenTreePlugin, path=parent_path)

View File

@ -798,7 +798,7 @@ function loadBomTable(table, options={}) {
// Part column
cols.push(
{
field: 'sub_part',
field: 'sub_part_detail.full_name',
title: '{% trans "Part" %}',
sortable: true,
switchable: false,