inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-08-14 23:51:08 +00:00
Code Activity

Merge branch 'master' of github.com:inventree/InvenTree into part_main_details

Browse Source
This commit is contained in:
eeintech
2021-07-30 10:50:28 -04:00
parent f61c768bbe 7ed43f5a11
commit 20b21a2b71
92 changed files with 101089 additions and 28563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/part/templates/part/detail.html
View File

@@ -416,7 +416,7 @@
});
// Wait for *all* the requests to complete
$.when.apply($, requests).then(function() {
$.when.apply($, requests).done(function() {
location.reload();
});
}
@@ -832,7 +832,7 @@
requests.push(inventreeDelete(url));
});
$.when.apply($, requests).then(function() {
$.when.apply($, requests).done(function() {
reloadSupplierPartTable();
});
}

21
InvenTree/part/templates/part/part_base.html
View File

@@ -422,17 +422,16 @@
{% if roles.part.change %}
{% settings_value "INVENTREE_DOWNLOAD_FROM_URL" as allow_download %}
{% if allow_download %}
$("#part-image-url").click(function() {
launchModalForm(
'{% url "part-image-download" part.id %}',
{
reload: true,
}
);
});
{% endif %}
if (global_settings.INVENTREE_DOWNLOAD_FROM_URL) {
$("#part-image-url").click(function() {
launchModalForm(
'{% url "part-image-download" part.id %}',
{
reload: true,
}
);
});
}
$("#part-image-select").click(function() {
launchModalForm("{% url 'part-image-select' part.id %}",