2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00

Brace style fixes

This commit is contained in:
Oliver Walters 2021-08-30 20:30:26 +10:00
parent e1adef5010
commit 4c39607e00
8 changed files with 64 additions and 51 deletions

View File

@ -23,7 +23,9 @@ function loadAttachmentTable(url, options) {
$(table).inventreeTable({ $(table).inventreeTable({
url: url, url: url,
name: options.name || 'attachments', name: options.name || 'attachments',
formatNoMatches: function() { return '{% trans "No attachments found" %}'}, formatNoMatches: function() {
return '{% trans "No attachments found" %}'
},
sortable: true, sortable: true,
search: false, search: false,
queryParams: options.filters || {}, queryParams: options.filters || {},

View File

@ -938,12 +938,9 @@ function loadBuildTable(table, options) {
title: '{% trans "Issued by" %}', title: '{% trans "Issued by" %}',
sortable: true, sortable: true,
formatter: function(value, row) { formatter: function(value, row) {
if (value) if (value) {
{
return row.issued_by_detail.username; return row.issued_by_detail.username;
} } else {
else
{
return `<i>{% trans "No user information" %}</i>`; return `<i>{% trans "No user information" %}</i>`;
} }
} }
@ -953,12 +950,9 @@ function loadBuildTable(table, options) {
title: '{% trans "Responsible" %}', title: '{% trans "Responsible" %}',
sortable: true, sortable: true,
formatter: function(value, row) { formatter: function(value, row) {
if (value) if (value) {
{
return row.responsible_detail.name; return row.responsible_detail.name;
} } else {
else
{
return '{% trans "No information" %}'; return '{% trans "No information" %}';
} }
} }
@ -1009,7 +1003,9 @@ function loadAllocationTable(table, part_id, part, url, required, button) {
table.bootstrapTable({ table.bootstrapTable({
url: url, url: url,
sortable: false, sortable: false,
formatNoMatches: function() { return '{% trans "No parts allocated for" %} ' + part; }, formatNoMatches: function() {
return '{% trans "No parts allocated for" %} ' + part;
},
columns: [ columns: [
{ {
field: 'stock_item_detail', field: 'stock_item_detail',

View File

@ -368,7 +368,9 @@ function loadCompanyTable(table, url, options={}) {
queryParams: filters, queryParams: filters,
groupBy: false, groupBy: false,
sidePagination: 'server', sidePagination: 'server',
formatNoMatches: function() { return "{% trans "No company information found" %}"; }, formatNoMatches: function() {
return '{% trans "No company information found" %}';
},
showColumns: true, showColumns: true,
name: options.pagetype || 'company', name: options.pagetype || 'company',
columns: columns, columns: columns,
@ -456,7 +458,9 @@ function loadManufacturerPartTable(table, url, options) {
queryParams: filters, queryParams: filters,
name: 'manufacturerparts', name: 'manufacturerparts',
groupBy: false, groupBy: false,
formatNoMatches: function() { return '{% trans "No manufacturer parts found" %}'; }, formatNoMatches: function() {
return '{% trans "No manufacturer parts found" %}';
},
columns: [ columns: [
{ {
checkbox: true, checkbox: true,
@ -851,7 +855,8 @@ function loadSupplierPartTable(table, url, options) {
onSuccess: function() { onSuccess: function() {
$(table).bootstrapTable('refresh'); $(table).bootstrapTable('refresh');
} }
}); }
);
}); });
$(table).find('.button-supplier-part-delete').click(function() { $(table).find('.button-supplier-part-delete').click(function() {
@ -863,7 +868,8 @@ function loadSupplierPartTable(table, url, options) {
onSuccess: function() { onSuccess: function() {
$(table).bootstrapTable('refresh'); $(table).bootstrapTable('refresh');
} }
}); }
);
}) })
} }
}); });

View File

@ -703,7 +703,9 @@ function updateFieldValues(fields, options) {
var field = fields[name] || null; var field = fields[name] || null;
if (field == null) { continue; } if (field == null) {
continue;
}
var value = field.value; var value = field.value;
@ -711,7 +713,9 @@ function updateFieldValues(fields, options) {
value = field.default; value = field.default;
} }
if (value == null) { continue; } if (value == null) {
continue;
}
updateFieldValue(name, value, field, options); updateFieldValue(name, value, field, options);
} }
@ -1086,6 +1090,8 @@ function initializeRelatedFields(fields, options) {
case 'choice': case 'choice':
initializeChoiceField(field, fields, options); initializeChoiceField(field, fields, options);
break; break;
default:
break;
} }
} }
} }

View File

@ -418,12 +418,15 @@ function afterForm(response, options) {
if (response.success) { if (response.success) {
showAlertOrCache("alert-success", response.success, cache); showAlertOrCache("alert-success", response.success, cache);
} }
if (response.info) { if (response.info) {
showAlertOrCache("alert-info", response.info, cache); showAlertOrCache("alert-info", response.info, cache);
} }
if (response.warning) { if (response.warning) {
showAlertOrCache("alert-warning", response.warning, cache); showAlertOrCache("alert-warning", response.warning, cache);
} }
if (response.danger) { if (response.danger) {
showAlertOrCache("alert-danger", response.danger, cache); showAlertOrCache("alert-danger", response.danger, cache);
} }
@ -431,14 +434,11 @@ function afterForm(response, options) {
// Was a callback provided? // Was a callback provided?
if (options.success) { if (options.success) {
options.success(response); options.success(response);
} } else if (options.follow && response.url) {
else if (options.follow && response.url) {
window.location.href = response.url; window.location.href = response.url;
} } else if (options.redirect) {
else if (options.redirect) {
window.location.href = options.redirect; window.location.href = options.redirect;
} } else if (options.reload) {
else if (options.reload) {
location.reload(); location.reload();
} }
} }
@ -883,9 +883,8 @@ function handleModalForm(url, options) {
if (response.form_valid) { if (response.form_valid) {
$(modal).modal('hide'); $(modal).modal('hide');
afterForm(response, options); afterForm(response, options);
} } else {
// Form was returned, invalid! // Form was returned, invalid!
else {
// Disable error message with option or response // Disable error message with option or response
if (!options.hideErrorMessage && !response.hideErrorMessage) { if (!options.hideErrorMessage && !response.hideErrorMessage) {
@ -916,14 +915,12 @@ function handleModalForm(url, options) {
if (response.buttons) { if (response.buttons) {
attachButtons(modal, response.buttons); attachButtons(modal, response.buttons);
} }
} } else {
else {
$(modal).modal('hide'); $(modal).modal('hide');
showAlertDialog('{% trans "Invalid response from server" %}', '{% trans "Form data missing from server response" %}'); showAlertDialog('{% trans "Invalid response from server" %}', '{% trans "Form data missing from server response" %}');
} }
} }
} } else {
else {
$(modal).modal('hide'); $(modal).modal('hide');
afterForm(response, options); afterForm(response, options);
} }

View File

@ -292,7 +292,9 @@ function loadPurchaseOrderTable(table, options) {
groupBy: false, groupBy: false,
sidePagination: 'server', sidePagination: 'server',
original: options.params, original: options.params,
formatNoMatches: function() { return '{% trans "No purchase orders found" %}'; }, formatNoMatches: function() {
return '{% trans "No purchase orders found" %}';
},
columns: [ columns: [
{ {
title: '', title: '',
@ -388,7 +390,9 @@ function loadSalesOrderTable(table, options) {
groupBy: false, groupBy: false,
sidePagination: 'server', sidePagination: 'server',
original: options.params, original: options.params,
formatNoMatches: function() { return '{% trans "No sales orders found" %}'; }, formatNoMatches: function() {
return '{% trans "No sales orders found" %}';
},
columns: [ columns: [
{ {
title: '', title: '',
@ -502,7 +506,9 @@ function loadSalesOrderAllocationTable(table, options={}) {
search: false, search: false,
paginationVAlign: 'bottom', paginationVAlign: 'bottom',
original: options.params, original: options.params,
formatNoMatches: function() { return '{% trans "No sales order allocations found" %}'; }, formatNoMatches: function() {
return '{% trans "No sales order allocations found" %}';
},
columns: [ columns: [
{ {
field: 'pk', field: 'pk',

View File

@ -539,7 +539,9 @@ function loadPartVariantTable(table, partId, options={}) {
showColumns: true, showColumns: true,
original: params, original: params,
queryParams: filters, queryParams: filters,
formatNoMatches: function() { return '{% trans "No variants found" %}'; }, formatNoMatches: function() {
return '{% trans "No variants found" %}';
},
columns: cols, columns: cols,
treeEnable: true, treeEnable: true,
rootParentId: partId, rootParentId: partId,
@ -587,7 +589,9 @@ function loadPartParameterTable(table, url, options) {
queryParams: filters, queryParams: filters,
name: 'partparameters', name: 'partparameters',
groupBy: false, groupBy: false,
formatNoMatches: function() { return '{% trans "No parameters found" %}'; }, formatNoMatches: function() {
return '{% trans "No parameters found" %}';
},
columns: [ columns: [
{ {
checkbox: true, checkbox: true,
@ -726,7 +730,9 @@ function loadParametricPartTable(table, options={}) {
queryParams: table_headers, queryParams: table_headers,
groupBy: false, groupBy: false,
name: options.name || 'parametric', name: options.name || 'parametric',
formatNoMatches: function() { return '{% trans "No parts found" %}'; }, formatNoMatches: function() {
return '{% trans "No parts found" %}';
},
columns: columns, columns: columns,
showColumns: true, showColumns: true,
data: table_data, data: table_data,
@ -913,8 +919,7 @@ function loadPartTable(table, url, options={}) {
formatter: function(value, row) { formatter: function(value, row) {
if (row.category) { if (row.category) {
return renderLink(value.pathstring, "/part/category/" + row.category + "/"); return renderLink(value.pathstring, "/part/category/" + row.category + "/");
} } else {
else {
return '{% trans "No category" %}'; return '{% trans "No category" %}';
} }
} }
@ -987,7 +992,9 @@ function loadPartTable(table, url, options={}) {
original: params, original: params,
sidePagination: 'server', sidePagination: 'server',
pagination: 'true', pagination: 'true',
formatNoMatches: function() { return '{% trans "No parts found" %}'; }, formatNoMatches: function() {
return '{% trans "No parts found" %}';
},
columns: columns, columns: columns,
showColumns: true, showColumns: true,
showCustomView: false, showCustomView: false,

View File

@ -881,13 +881,9 @@ function loadStockTable(table, options) {
// REJECTED // REJECTED
if (row.status == {{ StockStatus.REJECTED }}) { if (row.status == {{ StockStatus.REJECTED }}) {
html += makeIconBadge('fa-times-circle icon-red', '{% trans "Stock item has been rejected" %}'); html += makeIconBadge('fa-times-circle icon-red', '{% trans "Stock item has been rejected" %}');
} } else if (row.status == {{ StockStatus.LOST }}) {
// LOST
else if (row.status == {{ StockStatus.LOST }}) {
html += makeIconBadge('fa-question-circle','{% trans "Stock item is lost" %}'); html += makeIconBadge('fa-question-circle','{% trans "Stock item is lost" %}');
} } else if (row.status == {{ StockStatus.DESTROYED }}) {
else if (row.status == {{ StockStatus.DESTROYED }}) {
html += makeIconBadge('fa-skull-crossbones', '{% trans "Stock item is destroyed" %}'); html += makeIconBadge('fa-skull-crossbones', '{% trans "Stock item is destroyed" %}');
} }
@ -1682,13 +1678,10 @@ function loadStockTrackingTable(table, options) {
field: 'user', field: 'user',
title: '{% trans "User" %}', title: '{% trans "User" %}',
formatter: function(value, row) { formatter: function(value, row) {
if (value) if (value) {
{
// TODO - Format the user's first and last names // TODO - Format the user's first and last names
return row.user_detail.username; return row.user_detail.username;
} } else {
else
{
return `<i>{% trans "No user information" %}</i>`; return `<i>{% trans "No user information" %}</i>`;
} }
} }