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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Oliver Walters 2019-08-29 21:37:03 +10:00
commit 1e62528d2a
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
InvenTree/part/templates/part/category.html
View File

@ -36,9 +36,9 @@
</div>
{% if category and category.children.all|length > 0 %}
{% include "part/subcategories.html" with children=category.children.all collapse_id="children"%}
{% include "part/subcategories.html" with children=category.children.all collapse_id="categories" %}
{% elif children|length > 0 %}
{% include "part/subcategories.html" with children=children %}
{% include "part/subcategories.html" with children=children collapse_id="categories" %}
{% endif %}
<hr>
@ -65,6 +65,18 @@
{% block js_ready %}
{{ block.super }}
if (sessionStorage.getItem("inventree-show-part-categories")) {
$("#collapse-item-categories").collapse('show');
}
$("#collapse-item-categories").on('shown.bs.collapse', function() {
sessionStorage.setItem('inventree-show-part-categories', 1);
});
$("#collapse-item-categories").on('hidden.bs.collapse', function() {
sessionStorage.removeItem('inventree-show-part-categories');
});
$("#cat-create").click(function() {
launchModalForm(
"{% url 'category-create' %}",

13
InvenTree/stock/templates/stock/location.html
View File

@ -54,6 +54,19 @@
{% endblock %}
{% block js_ready %}
{{ block.super }}
if (sessionStorage.getItem("inventree-show-part-locations")) {
$("#collapse-item-locations").collapse('show');
}
$("#collapse-item-locations").on('shown.bs.collapse', function() {
sessionStorage.setItem('inventree-show-part-locations', 1);
});
$("#collapse-item-locations").on('hidden.bs.collapse', function() {
sessionStorage.removeItem('inventree-show-part-locations');
});
$('#location-create').click(function () {
launchModalForm("{% url 'stock-location-create' %}",
{