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

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

Browse Source
This commit is contained in:
eeintech
2020-10-01 09:02:21 -05:00
parent 40d8a07acc 7356fc3dfc
commit a71b5ef0a0
20 changed files with 190 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,12 @@
<div class='row'>
<div class='col-sm-6'>
{% if category %}
<h3>{{ category.name }}</h3>
<h3>
{{ category.name }}
{% if user.is_staff and perms.part.change_partcategory %}
<a href="{% url 'admin:part_partcategory_change' category.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
{% endif %}
</h3>
<p>{{ category.description }}</p>
{% else %}
<h3>{% trans "Part Categories" %}</h3>
@@ -109,9 +114,9 @@
</ul>
</div>
</div>
<div class='filter-list' id='filter-list-parts'>
<!-- Empty div -->
</div>
</div>
<div class='filter-list' id='filter-list-parts'>
<!-- Empty div -->
</div>
</div>

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

@@ -28,6 +28,9 @@
<div class="media-body">
<h3>
{{ part.full_name }}
{% if user.is_staff and perms.part.change_part %}
<a href="{% url 'admin:part_part_change' part.pk %}"><span title="{% trans 'Admin view' %}" class='fas fa-user-shield'></span></a>
{% endif %}
{% if not part.active %}
<div class='label label-large label-large-red'>
{% trans 'Inactive' %}