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

Synergise label filter help texts (#5100)

Browse Source 
* Synergise label filter help texts

* Fix QR code alt text

* Change label alt text from QC or QR
This commit is contained in:
Lavissa 2023-06-24 00:40:36 +02:00 committed by GitHub
parent 24b554a8d2
commit a5c8d86530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
InvenTree/label/migrations/0011_auto_20230623_2158.py Normal file
View File

@ -0,0 +1,29 @@
# Generated by Django 3.2.19 on 2023-06-23 21:58
from django.db import migrations, models
import label.models
class Migration(migrations.Migration):
dependencies = [
('label', '0010_buildlinelabel'),
]
operations = [
migrations.AlterField(
model_name='partlabel',
name='filters',
field=models.CharField(blank=True, help_text='Query filters (comma-separated list of key=value pairs)', max_length=250, validators=[label.models.validate_part_filters], verbose_name='Filters'),
),
migrations.AlterField(
model_name='stockitemlabel',
name='filters',
field=models.CharField(blank=True, help_text='Query filters (comma-separated list of key=value pairs)', max_length=250, validators=[label.models.validate_stock_item_filters], verbose_name='Filters'),
),
migrations.AlterField(
model_name='stocklocationlabel',
name='filters',
field=models.CharField(blank=True, help_text='Query filters (comma-separated list of key=value pairs)', max_length=250, validators=[label.models.validate_stock_location_filters], verbose_name='Filters'),
),
]

6
InvenTree/label/models.py
View File

@ -247,7 +247,7 @@ class StockItemLabel(LabelTemplate):
filters = models.CharField(
blank=True, max_length=250,
help_text=_('Query filters (comma-separated list of key=value pairs),'),
help_text=_('Query filters (comma-separated list of key=value pairs)'),
verbose_name=_('Filters'),
validators=[
validate_stock_item_filters
@ -288,7 +288,7 @@ class StockLocationLabel(LabelTemplate):
filters = models.CharField(
blank=True, max_length=250,
help_text=_('Query filters (comma-separated list of key=value pairs'),
help_text=_('Query filters (comma-separated list of key=value pairs)'),
verbose_name=_('Filters'),
validators=[
validate_stock_location_filters]
@ -316,7 +316,7 @@ class PartLabel(LabelTemplate):
filters = models.CharField(
blank=True, max_length=250,
help_text=_('Part query filters (comma-separated value of key=value pairs)'),
help_text=_('Query filters (comma-separated list of key=value pairs)'),
verbose_name=_('Filters'),
validators=[
validate_part_filters

2
InvenTree/label/templates/label/part/part_label.html
View File

@ -28,7 +28,7 @@
{% block content %}
<img class='qr' alt="{% trans 'QC Code' %}" src='{% qrcode qr_data %}'>
<img class='qr' alt="{% trans 'QR Code' %}" src='{% qrcode qr_data %}'>
<div class='part'>
{{ part.full_name }}

2
InvenTree/label/templates/label/stockitem/qr.html
View File

@ -18,5 +18,5 @@
{% block content %}
<img class='qr' alt="{% trans 'QC Code' %}" src='{% qrcode qr_data %}'>
<img class='qr' alt="{% trans 'QR Code' %}" src='{% qrcode qr_data %}'>
{% endblock content %}

2
InvenTree/label/templates/label/stocklocation/qr.html
View File

@ -18,5 +18,5 @@
{% block content %}
<img class='qr' alt="{% trans 'QC Code' %}" src='{% qrcode qr_data %}'>
<img class='qr' alt="{% trans 'QR Code' %}" src='{% qrcode qr_data %}'>
{% endblock content %}

2
InvenTree/templates/allauth_2fa/setup.html
View File

@ -15,7 +15,7 @@
</p>
<div class="bg-qr-code rounded">
<img src="{{ qr_code_url }}" alt="{% trans 'QC Code' %}" class="mx-auto d-block"/>
<img src="{{ qr_code_url }}" alt="{% trans 'QR Code' %}" class="mx-auto d-block"/>
</div>
<br>