From 92c01150a6d8738aa15736054a1f160a41a7af14 Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Mon, 25 Mar 2019 21:29:53 +0100 Subject: [PATCH 1/2] add JS safety check for async table filter --- static/js/utils/asyncTableFilter.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/static/js/utils/asyncTableFilter.js b/static/js/utils/asyncTableFilter.js index 9106de2c1..6030ead66 100644 --- a/static/js/utils/asyncTableFilter.js +++ b/static/js/utils/asyncTableFilter.js @@ -31,10 +31,15 @@ if (formElement.matches('.' + JS_INITIALIZED_CLASS)) { return false; } + + var formIdElement = formElement.querySelector('[name="form-identifier"]'); + if (!formIdElement) { + return; + } + options = options || {}; var tableIdent = options.dbtIdent; - - var formId = formElement.querySelector('[name="form-identifier"]').value; + var formId = formIdElement.value; var inputs = { search: [], input: [], From 642a929d93abc7b02361ab8f6b039e258d5cd848 Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Mon, 25 Mar 2019 21:35:25 +0100 Subject: [PATCH 2/2] fix broken table sorting due to links being absolute all of a sudden --- static/js/utils/asyncTable.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/js/utils/asyncTable.js b/static/js/utils/asyncTable.js index 5e8e371e9..e4b7d87bc 100644 --- a/static/js/utils/asyncTable.js +++ b/static/js/utils/asyncTable.js @@ -124,7 +124,10 @@ function clickHandler(event, tableOptions) { event.preventDefault(); - var url = new URL(window.location.origin + window.location.pathname + getClickDestination(this)); + var url = getClickDestination(this); + if (!url.match(/^http/)) { + url = new URL(window.location.origin + window.location.pathname + getClickDestination(this)); + } updateTableFrom(url, tableOptions); }