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 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2019-05-08 23:33:55 +10:00
commit 09b7578c35
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
InvenTree/build/templates/build/allocation_item.html
View File

@ -4,20 +4,14 @@
{% load inventree_extras %}
{% block collapse_title %}
<div>
<div class='media-left'>
<img class='part-thumb' style='height: auto; width: 48px;'
{% if item.sub_part.image %}
src="{{ item.sub_part.image.url }}" alt='{{ item.sub_part.name }}'>
{% else %}
src="{% static 'img/blank_image.png' %}" alt='No image'>
{% endif %}
<div class='hover-icon media-left' style='float: left;'>
<img class='hover-img-thumb' src="{% if item.sub_part.image %}{{ item.sub_part.image.url }}{% endif %}">
<img class='hover-img-large' src="{% if item.sub_part.image %}{{ item.sub_part.image.url }}{% endif %}">
</div>
<div class='media-body'>
<div>
{{ item.sub_part.name }}<br>
<small><i>{{ item.sub_part.description }}</i></small>
</div>
</div>
{% endblock %}
{% block collapse_heading %}

2
InvenTree/static/script/inventree/stock.js
View File

@ -366,7 +366,7 @@ function loadStockTable(table, options) {
title: 'Part',
sortable: true,
formatter: function(value, row, index, field) {
return imageHoverIcon(row.part.image_url) + renderLink(value, row.part.url);
return imageHoverIcon(row.part.image_url) + renderLink(value, row.part.url + 'stock/');
}
},
{