From efc229061322a5bacf8824b025fa81a32f1376c2 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Fri, 12 Feb 2021 19:57:44 +1100
Subject: [PATCH] Remove code which was causing issue
---
InvenTree/templates/js/stock.js | 6 +++---
InvenTree/templates/js/tables.js | 10 +---------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/InvenTree/templates/js/stock.js b/InvenTree/templates/js/stock.js
index b156fbc271..3e6fee43e4 100644
--- a/InvenTree/templates/js/stock.js
+++ b/InvenTree/templates/js/stock.js
@@ -101,7 +101,7 @@ function loadStockTestResultsTable(table, options) {
},
{
field: 'test_name',
- title: "{% trans "Test Name" %}",
+ title: '{% trans "Test Name" %}',
sortable: true,
formatter: function(value, row) {
var html = value;
@@ -925,7 +925,7 @@ function loadStockTrackingTable(table, options) {
}
else
{
- return "{% trans "No user information" %}";
+ return '{% trans "No user information" %}';
}
}
});
@@ -1206,7 +1206,7 @@ function loadInstalledInTable(table, options) {
columns: [
{
checkbox: true,
- title: '{% trans 'Select' %}',
+ title: '{% trans "Select" %}',
searchable: false,
switchable: false,
},
diff --git a/InvenTree/templates/js/tables.js b/InvenTree/templates/js/tables.js
index 9bb10552bf..f2107d8fc9 100644
--- a/InvenTree/templates/js/tables.js
+++ b/InvenTree/templates/js/tables.js
@@ -11,7 +11,7 @@ function deleteButton(url, text='Delete') {
function renderLink(text, url, options={}) {
- if (url == null || url === '') {
+ if (url === null || url === undefined || url === '') {
return text;
}
@@ -19,14 +19,6 @@ function renderLink(text, url, options={}) {
var remove_http = options.remove_http || false;
- if (remove_http) {
- if (text.startsWith('http://')) {
- text = text.slice(7);
- } else if (text.startsWith('https://')) {
- text = text.slice(8);
- }
- }
-
// Shorten the displayed length if required
if ((max_length > 0) && (text.length > max_length)) {
var slice_length = (max_length - 3) / 2;