From f6100015438d15851d97df36571edab2be777700 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Mon, 8 Apr 2024 12:47:46 +0300 Subject: [PATCH 1/3] Fix: If Select has no Options, don't try to select 1 Option in Filter page Because selecting an option that does not exist results in an error. For example, when cloning a Tags filter string when there are no tags. --- web/skins/classic/views/js/filter.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index b0527ad3b..62f210403 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -383,7 +383,8 @@ function addTerm( element ) { row.find('select').chosen('destroy'); var newRow = row.clone().insertAfter(row); newRow.find('select').each( function() { //reset new row to default - this[0].selected = 'selected'; + if ($j(this).find('option').length > 0 ) + this[0].selected = 'selected'; }); newRow.find('input[type="text"]').val(''); newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function(el) { From a8d1f39005aad185bc3a194bbb8cec7ea2b9b0ac Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Mon, 8 Apr 2024 12:50:29 +0300 Subject: [PATCH 2/3] Chore Replace Tabs to Space --- web/skins/classic/views/js/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index 62f210403..9320f7918 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -383,7 +383,7 @@ function addTerm( element ) { row.find('select').chosen('destroy'); var newRow = row.clone().insertAfter(row); newRow.find('select').each( function() { //reset new row to default - if ($j(this).find('option').length > 0 ) + if ($j(this).find('option').length > 0 ) this[0].selected = 'selected'; }); newRow.find('input[type="text"]').val(''); From 464f31c4f2bed1e3c80f2b7e090bbcbe2e7cc087 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Mon, 8 Apr 2024 17:58:19 +0300 Subject: [PATCH 3/3] Disabled "reset new row to default" --- web/skins/classic/views/js/filter.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index 9320f7918..d9d883242 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -382,10 +382,10 @@ function addTerm( element ) { var row = $j(element).closest('tr'); row.find('select').chosen('destroy'); var newRow = row.clone().insertAfter(row); - newRow.find('select').each( function() { //reset new row to default - if ($j(this).find('option').length > 0 ) - this[0].selected = 'selected'; - }); + //newRow.find('select').each( function() { //reset new row to default + // if ($j(this).find('option').length > 0 ) + // this[0].selected = 'selected'; + //}); newRow.find('input[type="text"]').val(''); newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function(el) { var fnName = el.getAttribute("data-on-click-this");