inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

Load build order prefix setting

Browse Source
This commit is contained in:
Oliver Walters 2020-10-20 08:41:08 +11:00
parent 7aa473712f
commit 406d7bcf80
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
InvenTree/InvenTree/helpers.py
View File

@ -19,9 +19,18 @@ from django.contrib.auth.models import Permission
import InvenTree.version import InvenTree.version
from common.models import InvenTreeSetting
from .settings import MEDIA_URL, STATIC_URL from .settings import MEDIA_URL, STATIC_URL
def getSetting(key, backup_value=None):
"""
Shortcut for reading a setting value from the database
"""
return InvenTreeSetting.get_setting(key, backup_value=backup_value)
def generateTestKey(test_name): def generateTestKey(test_name):
""" """
Generate a test 'key' for a given test name. Generate a test 'key' for a given test name.

6
InvenTree/build/models.py
View File

@ -22,7 +22,7 @@ from markdownx.models import MarkdownxField
from mptt.models import MPTTModel, TreeForeignKey from mptt.models import MPTTModel, TreeForeignKey
from InvenTree.status_codes import BuildStatus from InvenTree.status_codes import BuildStatus
from InvenTree.helpers import increment from InvenTree.helpers import increment, getSetting
from InvenTree.validators import validate_build_order_reference from InvenTree.validators import validate_build_order_reference
import InvenTree.fields import InvenTree.fields
@ -56,7 +56,9 @@ class Build(MPTTModel):
def __str__(self): def __str__(self):
return f"BO{self.reference}" prefix = getSetting("BUILDORDER_REFERENCE_PREFIX")
return f"{prefix}{self.reference}"
def get_absolute_url(self): def get_absolute_url(self):
return reverse('build-detail', kwargs={'pk': self.id}) return reverse('build-detail', kwargs={'pk': self.id})

2
InvenTree/build/templates/build/build_base.html
View File

@ -71,7 +71,7 @@ src="{% static 'img/blank_image.png' %}"
<tr> <tr>
<td><span class='fas fa-hashtag'></span></td> <td><span class='fas fa-hashtag'></span></td>
<td>{% trans "Build Order Reference" %}</td> <td>{% trans "Build Order Reference" %}</td>
<td>{{ build.reference }}</td> <td>{{ build }}</td>
</tr> </tr>
<tr> <tr>
<td><span class='fas fa-shapes'></span></td> <td><span class='fas fa-shapes'></span></td>

4
InvenTree/common/models.py
View File

@ -62,6 +62,10 @@ class InvenTreeSetting(models.Model):
If it does not exist, return the backup value (default = None) If it does not exist, return the backup value (default = None)
""" """
# If no backup value is specified, atttempt to retrieve a "default" value
if backup_value is None:
backup_value = InvenTreeSetting.DEFAULT_VALUES.get(key, None)
try: try:
settings = InvenTreeSetting.objects.filter(key__iexact=key) settings = InvenTreeSetting.objects.filter(key__iexact=key)

8
InvenTree/templates/js/build.html
View File

@ -1,4 +1,5 @@
{% load i18n %} {% load i18n %}
{% load inventree_extras %}
function loadBuildTable(table, options) { function loadBuildTable(table, options) {
// Display a table of Build objects // Display a table of Build objects
@ -40,6 +41,13 @@ function loadBuildTable(table, options) {
sortable: true, sortable: true,
switchable: false, switchable: false,
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var prefix = "{% inventree_setting 'BUILDORDER_REFERENCE_PREFIX' 'BO' %}";
if (prefix) {
value = `${prefix}${value}`;
}
return renderLink(value, '/build/' + row.pk + '/'); return renderLink(value, '/build/' + row.pk + '/');
} }
}, },