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

Improve wording for "Inherited" option of BOM items (#4376) (#4397)

Browse Source 
* improve wording for "Inherited" option of BOM items (#4376)

* add migrations
This commit is contained in:
simonkuehling 2023-02-23 20:58:54 +01:00 committed by GitHub
parent 89ac0a623b
commit efb55c720f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/api.py
View File

@ -1634,7 +1634,7 @@ class BomFilter(rest_filters.FilterSet):
# Boolean filters for BOM item
optional = rest_filters.BooleanFilter(label='BOM item is optional')
consumable = rest_filters.BooleanFilter(label='BOM item is consumable')
inherited = rest_filters.BooleanFilter(label='BOM item is inherited')
inherited = rest_filters.BooleanFilter(label='BOM item gets inherited')
allow_variants = rest_filters.BooleanFilter(label='Variants are allowed')
# Filters for linked 'part'

18
InvenTree/part/migrations/0099_alter_bomitem_inherited.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 3.2.18 on 2023-02-23 11:53
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('part', '0098_auto_20230214_1115'),
]
operations = [
migrations.AlterField(
model_name='bomitem',
name='inherited',
field=models.BooleanField(default=False, help_text='This BOM item is inherited by BOMs for variant parts', verbose_name='Gets inherited'),
),
]

2
InvenTree/part/models.py
View File

@ -3512,7 +3512,7 @@ class BomItem(DataImportMixin, models.Model):
inherited = models.BooleanField(
default=False,
verbose_name=_('Inherited'),
verbose_name=_('Gets inherited'),
help_text=_('This BOM item is inherited by BOMs for variant parts'),
)

2
InvenTree/part/templates/part/upload_bom.html
View File

@ -54,7 +54,7 @@
<th>{% trans "Reference" %}</th>
<th>{% trans "Overage" %}</th>
<th>{% trans "Allow Variants" %}</th>
<th>{% trans "Inherited" %}</th>
<th>{% trans "Gets inherited" %}</th>
<th>{% trans "Optional" %}</th>
<th>{% trans "Note" %}</th>
<th><!-- Buttons Column --></th>

7
InvenTree/templates/js/translated/bom.js
View File

@ -1019,7 +1019,7 @@ function loadBomTable(table, options={}) {
cols.push({
field: 'inherited',
title: '{% trans "Inherited" %}',
title: '{% trans "Gets inherited" %}',
searchable: false,
formatter: function(value, row) {
// This BOM item *is* inheritable, but is defined for this BOM
@ -1029,10 +1029,7 @@ function loadBomTable(table, options={}) {
return yesNoLabel(true);
} else {
// If this BOM item is inherited from a parent part
return renderLink(
'{% trans "View BOM" %}',
`/part/${row.part}/bom/`,
);
return yesNoLabel(true, {muted: true});
}
}
});

17
InvenTree/templates/js/translated/helpers.js
View File

@ -19,12 +19,23 @@
withTitle,
*/
function yesNoLabel(value) {
function yesNoLabel(value, options={}) {
var text = '';
var color = '';
if (value) {
return `<span class='badge rounded-pill bg-success'>{% trans "YES" %}</span>`;
text = '{% trans "YES" %}';
color = 'bg-success';
} else {
return `<span class='badge rounded-pill bg-warning'>{% trans "NO" %}</span>`;
text = '{% trans "NO" %}';
color = 'bg-warning';
}
if (options.muted) {
color = 'bg-secondary';
}
return `<span class='badge rounded-pill ${color}'>${text}</span>`;
}

4
InvenTree/templates/js/translated/table_filters.js
View File

@ -73,7 +73,7 @@ function getAvailableTableFilters(tableKey) {
},
inherited: {
type: 'bool',
title: '{% trans "Inherited" %}',
title: '{% trans "Gets inherited" %}',
},
allow_variants: {
type: 'bool',
@ -105,7 +105,7 @@ function getAvailableTableFilters(tableKey) {
return {
'inherited': {
type: 'bool',
title: '{% trans "Inherited" %}',
title: '{% trans "Gets inherited" %}',
},
'optional': {
type: 'bool',