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

Brace style fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/templates/js/translated/attachment.js
View File

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

18
InvenTree/templates/js/translated/build.js
View File

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

14
InvenTree/templates/js/translated/company.js
View File

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

10
InvenTree/templates/js/translated/forms.js
View File

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

23
InvenTree/templates/js/translated/modals.js
View File

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

12
InvenTree/templates/js/translated/order.js
View File

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

19
InvenTree/templates/js/translated/part.js
View File

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

15
InvenTree/templates/js/translated/stock.js
View File

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