mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Merge branch 'image-upload-fix'
This commit is contained in:
commit
dc03283e14
@ -39,6 +39,7 @@
|
|||||||
$("#part-table").bootstrapTable({
|
$("#part-table").bootstrapTable({
|
||||||
sortable: true,
|
sortable: true,
|
||||||
search: true,
|
search: true,
|
||||||
|
formatNoMatches: function() { return "No supplier parts found for {{ company.name }}"; },
|
||||||
queryParams: function(p) {
|
queryParams: function(p) {
|
||||||
return {
|
return {
|
||||||
supplier: {{ company.id }}
|
supplier: {{ company.id }}
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
sortable: true,
|
sortable: true,
|
||||||
search: true,
|
search: true,
|
||||||
pagination: true,
|
pagination: true,
|
||||||
|
formatNoMatches: function() { return "No company information found"; },
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
field: 'pk',
|
field: 'pk',
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
$("#supplier-table").bootstrapTable({
|
$("#supplier-table").bootstrapTable({
|
||||||
sortable: true,
|
sortable: true,
|
||||||
search: true,
|
search: true,
|
||||||
|
formatNoMatches: function() { return "No supplier parts available for {{ part.name }}"; },
|
||||||
queryParams: function(p) {
|
queryParams: function(p) {
|
||||||
return {
|
return {
|
||||||
part: {{ part.id }}
|
part: {{ part.id }}
|
||||||
|
@ -6,21 +6,9 @@
|
|||||||
|
|
||||||
<h3>Used In</h3>
|
<h3>Used In</h3>
|
||||||
|
|
||||||
{% if part.used_in_count > 0 %}
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<b>{{ part.name }}</b> is used to make {{ part.used_in_count }} other parts.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<table class="table table-striped table-condensed" id='used-table'>
|
<table class="table table-striped table-condensed" id='used-table'>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
{% else %}
|
|
||||||
<p>
|
|
||||||
{{ part.name }} is not used to make any other parts.
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block js_ready %}
|
{% block js_ready %}
|
||||||
@ -29,6 +17,7 @@
|
|||||||
$("#used-table").bootstrapTable({
|
$("#used-table").bootstrapTable({
|
||||||
sortable: true,
|
sortable: true,
|
||||||
search: true,
|
search: true,
|
||||||
|
formatNoMatches: function() { return "{{ part.name }} is not used to make any other parts"; },
|
||||||
queryParams: function(p) {
|
queryParams: function(p) {
|
||||||
return {
|
return {
|
||||||
sub_part: {{ part.id }}
|
sub_part: {{ part.id }}
|
||||||
|
@ -164,6 +164,7 @@ function loadBomTable(table, options) {
|
|||||||
table.bootstrapTable({
|
table.bootstrapTable({
|
||||||
sortable: true,
|
sortable: true,
|
||||||
search: true,
|
search: true,
|
||||||
|
formatNoMatches: function() { return "No BOM items found"; },
|
||||||
clickToSelect: true,
|
clickToSelect: true,
|
||||||
queryParams: function(p) {
|
queryParams: function(p) {
|
||||||
return {
|
return {
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
sortable: true,
|
sortable: true,
|
||||||
search: true,
|
search: true,
|
||||||
pagination: true,
|
pagination: true,
|
||||||
|
formatNoMatches: function() { return "No parts found matching search query"; },
|
||||||
queryParams: function(p) {
|
queryParams: function(p) {
|
||||||
return {
|
return {
|
||||||
search: "{{ query }}",
|
search: "{{ query }}",
|
||||||
|
Loading…
Reference in New Issue
Block a user