From 445a81d73ba1026b2e445c87183afdd34f271ca9 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 18 Sep 2023 20:28:07 +0200 Subject: [PATCH] ui: selectpicker issue with ipv4v6net after version update - fix for https://github.com/opnsense/core/issues/6849 Handling is a bit different since the latest selectpicker doesn't select the top item in the list anymore, we need to choose an item to make it look less odd. --- src/www/javascript/opnsense_legacy.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/www/javascript/opnsense_legacy.js b/src/www/javascript/opnsense_legacy.js index 34506e5ee..87fb7c17e 100644 --- a/src/www/javascript/opnsense_legacy.js +++ b/src/www/javascript/opnsense_legacy.js @@ -46,7 +46,7 @@ function hook_ipv4v6(classname, data_id, prefixlen) let val = $(this).val(); if (val.indexOf(":") != -1) { for (let i = 33; i <= 128; ++i) { - $("#"+selectlist_id+' option[value=' + i + ']').show() + $("#"+selectlist_id+' option[value=' + i + ']').attr('disabled', null); } if ((type === undefined && val == '') || type === '4') { net = prefixlen == undefined ? '64' : prefixlen; @@ -58,12 +58,16 @@ function hook_ipv4v6(classname, data_id, prefixlen) } type = '4'; for (let i = 33; i <= 128; ++i) { - $("#"+selectlist_id+' option[value=' + i + ']').hide() + $("#"+selectlist_id+' option[value=' + i + ']').attr('disabled', 'disabled'); } } $("#"+selectlist_id).val(net); $(this).data('ipv4v6', type); /* when select list uses selectpicker, refresh */ + $("#"+selectlist_id).data('hideDisabled', true); + if ($("#"+selectlist_id).val() === null) { + $("#"+selectlist_id).val(type === '6' ? '64' : '24'); + } if ($("#"+selectlist_id).hasClass('selectpicker')) { $("#"+selectlist_id).selectpicker('refresh'); }