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

Merge pull request #2727 from SchrodingersGat/build-allocation-load-speed

Browse Source 
Bug fixes for build output creation
This commit is contained in:
Oliver 2022-03-09 13:46:56 +11:00 committed by GitHub
commit dd5cda281e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 238 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/build/models.py
View File

@ -715,7 +715,7 @@ class Build(MPTTModel, ReferenceIndexingMixin):
build=self,
bom_item=bom_item,
stock_item=stock_item,
quantity=quantity,
quantity=1,
install_into=output,
)

155
InvenTree/build/templates/build/detail.html
View File

@ -323,17 +323,8 @@
{% block js_ready %}
{{ block.super }}
$('#btn-create-output').click(function() {
createBuildOutput(
{{ build.pk }},
{
trackable_parts: {% if build.part.has_trackable_parts %}true{% else %}false{% endif%},
}
);
});
loadStockTable($("#build-stock-table"), {
onPanelLoad('completed', function() {
loadStockTable($("#build-stock-table"), {
params: {
location_detail: true,
part_detail: true,
@ -345,11 +336,70 @@ loadStockTable($("#build-stock-table"), {
'#stock-options',
],
url: "{% url 'api-stock-list' %}",
});
});
onPanelLoad('children', function() {
loadBuildTable($('#sub-build-table'), {
url: '{% url "api-build-list" %}',
filterTarget: "#filter-list-sub-build",
params: {
ancestor: {{ build.pk }},
}
});
});
// Get the list of BOM items required for this build
inventreeGet(
onPanelLoad('attachments', function() {
enableDragAndDrop(
'#attachment-dropzone',
'{% url "api-build-attachment-list" %}',
{
data: {
build: {{ build.id }},
},
label: 'attachment',
success: function(data, status, xhr) {
location.reload();
}
}
);
loadAttachmentTable('{% url "api-build-attachment-list" %}', {
filters: {
build: {{ build.pk }},
},
fields: {
build: {
value: {{ build.pk }},
hidden: true,
}
}
});
});
onPanelLoad('notes', function() {
$('#edit-notes').click(function() {
constructForm('{% url "api-build-detail" build.pk %}', {
fields: {
notes: {
multiline: true,
}
},
title: '{% trans "Edit Notes" %}',
reload: true,
});
});
});
function reloadTable() {
$('#allocation-table-untracked').bootstrapTable('refresh');
}
onPanelLoad('allocate', function() {
// Get the list of BOM items required for this build
inventreeGet(
'{% url "api-bom-list" %}',
{
part: {{ build.part.pk }},
@ -434,62 +484,21 @@ inventreeGet(
{% endif %}
}
}
);
);
loadBuildTable($('#sub-build-table'), {
url: '{% url "api-build-list" %}',
filterTarget: "#filter-list-sub-build",
params: {
ancestor: {{ build.pk }},
}
});
$('#btn-create-output').click(function() {
enableDragAndDrop(
'#attachment-dropzone',
'{% url "api-build-attachment-list" %}',
createBuildOutput(
{{ build.pk }},
{
data: {
build: {{ build.id }},
},
label: 'attachment',
success: function(data, status, xhr) {
location.reload();
trackable_parts: {% if build.part.has_trackable_parts %}true{% else %}false{% endif%},
}
}
);
loadAttachmentTable('{% url "api-build-attachment-list" %}', {
filters: {
build: {{ build.pk }},
},
fields: {
build: {
value: {{ build.pk }},
hidden: true,
}
}
});
$('#edit-notes').click(function() {
constructForm('{% url "api-build-detail" build.pk %}', {
fields: {
notes: {
multiline: true,
}
},
title: '{% trans "Edit Notes" %}',
reload: true,
);
});
});
function reloadTable() {
$('#allocation-table-untracked').bootstrapTable('refresh');
}
{% if build.active %}
{% if build.active %}
$("#btn-auto-allocate").on('click', function() {
$("#btn-auto-allocate").on('click', function() {
autoAllocateStockToBuild(
{{ build.pk }},
@ -500,9 +509,9 @@ $("#btn-auto-allocate").on('click', function() {
{% endif %}
}
);
});
});
$("#btn-allocate").on('click', function() {
$("#btn-allocate").on('click', function() {
var bom_items = $("#allocation-table-untracked").bootstrapTable("getData");
@ -535,15 +544,15 @@ $("#btn-allocate").on('click', function() {
}
);
}
});
});
$('#btn-unallocate').on('click', function() {
$('#btn-unallocate').on('click', function() {
unallocateStock({{ build.id }}, {
table: '#allocation-table-untracked',
});
});
});
$('#allocate-selected-items').click(function() {
$('#allocate-selected-items').click(function() {
var bom_items = $("#allocation-table-untracked").bootstrapTable("getSelections");
@ -564,19 +573,19 @@ $('#allocate-selected-items').click(function() {
}
}
);
});
});
$("#btn-order-parts").click(function() {
$("#btn-order-parts").click(function() {
launchModalForm("/order/purchase-order/order-parts/", {
data: {
build: {{ build.id }},
},
});
});
});
{% endif %}
{% endif %}
});
enableSidebar('buildorder');
{% endblock %}

2
InvenTree/common/apps.py
View File

@ -23,7 +23,7 @@ class CommonConfig(AppConfig):
try:
import common.models
if common.models.InvenTreeSetting.get_setting('SERVER_RESTART_REQUIRED'):
if common.models.InvenTreeSetting.get_setting('SERVER_RESTART_REQUIRED', backup_value=False, create=False):
logger.info("Clearing SERVER_RESTART_REQUIRED flag")
common.models.InvenTreeSetting.set_setting('SERVER_RESTART_REQUIRED', False, None)
except:

4
InvenTree/common/models.py
View File

@ -268,6 +268,10 @@ class BaseInvenTreeSetting(models.Model):
# Setting does not exist! (Try to create it)
if not setting:
# Unless otherwise specified, attempt to create the setting
create = kwargs.get('create', True)
if create:
# Attempt to create a new settings object
setting = cls(
key=key,