mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-21 06:16:29 +00:00
Merge remote-tracking branch 'inventree/master'
This commit is contained in:
InvenTree
InvenTree
static
script
inventree
locale
cs
LC_MESSAGES
de
LC_MESSAGES
el
LC_MESSAGES
en
LC_MESSAGES
es
LC_MESSAGES
es_MX
LC_MESSAGES
fa
LC_MESSAGES
fr
LC_MESSAGES
he
LC_MESSAGES
hu
LC_MESSAGES
id
LC_MESSAGES
it
LC_MESSAGES
ja
LC_MESSAGES
ko
LC_MESSAGES
nl
LC_MESSAGES
no
LC_MESSAGES
pl
LC_MESSAGES
pt
LC_MESSAGES
pt_br
LC_MESSAGES
ru
LC_MESSAGES
sv
LC_MESSAGES
th
LC_MESSAGES
tr
LC_MESSAGES
vi
LC_MESSAGES
zh
LC_MESSAGES
plugin
templates
js
translated
@ -110,7 +110,7 @@ function inventreeDocReady() {
|
|||||||
launchModalForm(`/about/`, {
|
launchModalForm(`/about/`, {
|
||||||
no_post: true,
|
no_post: true,
|
||||||
after_render: function() {
|
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
|
// Generate brand-icons
|
||||||
$('.brand-icon').each(function(i, obj) {
|
$('.brand-icon').each(function(i, obj) {
|
||||||
loadBrandIcon($(this), $(this).attr('brand_name'));
|
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
@ -252,7 +252,8 @@ class PluginsRegistry:
|
|||||||
|
|
||||||
# If a "path" is provided, some special handling is required
|
# If a "path" is provided, some special handling is required
|
||||||
if parent_obj.name is not plugin and len(parent_obj.parts) > 1:
|
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
|
plugin = parent_obj.name
|
||||||
|
|
||||||
modules = get_plugins(importlib.import_module(plugin), InvenTreePlugin, path=parent_path)
|
modules = get_plugins(importlib.import_module(plugin), InvenTreePlugin, path=parent_path)
|
||||||
|
@ -798,7 +798,7 @@ function loadBomTable(table, options={}) {
|
|||||||
// Part column
|
// Part column
|
||||||
cols.push(
|
cols.push(
|
||||||
{
|
{
|
||||||
field: 'sub_part',
|
field: 'sub_part_detail.full_name',
|
||||||
title: '{% trans "Part" %}',
|
title: '{% trans "Part" %}',
|
||||||
sortable: true,
|
sortable: true,
|
||||||
switchable: false,
|
switchable: false,
|
||||||
|
Reference in New Issue
Block a user