opnsense/plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2025-12-12 00:30:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

www/caddy: Fix race condition that moved domain filter selectpicker into invisible tab, fix css (#5076)

Browse Source
This commit is contained in:
Monviech 2025-12-08 17:09:31 +01:00 committed by GitHub
parent 06170082ad
commit ec2181d8a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/caddy/Makefile
View File

@ -1,6 +1,6 @@
PLUGIN_NAME= caddy PLUGIN_NAME= caddy
PLUGIN_VERSION= 2.0.4 PLUGIN_VERSION= 2.0.4
PLUGIN_REVISION= 2 PLUGIN_REVISION= 3
PLUGIN_DEPENDS= caddy-custom PLUGIN_DEPENDS= caddy-custom
PLUGIN_COMMENT= Modern Reverse Proxy with Automatic HTTPS, Dynamic DNS and Layer4 Routing PLUGIN_COMMENT= Modern Reverse Proxy with Automatic HTTPS, Dynamic DNS and Layer4 Routing
PLUGIN_MAINTAINER= cedrik@pischem.com PLUGIN_MAINTAINER= cedrik@pischem.com

1
www/caddy/pkg-descr
View File

@ -12,6 +12,7 @@ Add: DNS-01 challenge delegation via CNAME (contributed by sdsys-ch) (opnsense/p
Fix: Enabling HTTP access log wrongly excluded the process logs (opnsense/plugins/pull/4974) Fix: Enabling HTTP access log wrongly excluded the process logs (opnsense/plugins/pull/4974)
Fix: fix setup.sh script not setting correct ownership in www user mode (opnsense/plugins/pull/4976) Fix: fix setup.sh script not setting correct ownership in www user mode (opnsense/plugins/pull/4976)
Fix: Prevent sudo on startup via skip_install_trust (opnsense/plugins/pull/5015) Fix: Prevent sudo on startup via skip_install_trust (opnsense/plugins/pull/5015)
Fix: Fix race condition that moved domain filter selectpicker into invisible tab (opnsense/plugins/pull/5076)
2.0.3 2.0.3

29
www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
View File

@ -260,12 +260,16 @@
{% if entrypoint == 'reverse_proxy' %} {% if entrypoint == 'reverse_proxy' %}
// insert buttons and selectpicker // insert buttons and selectpicker only when the tab is actually visible
if (['{{formGridReverseProxy["table_id"]}}', '{{formGridHandle["table_id"]}}'].includes(grid_id)) { if (['{{formGridReverseProxy["table_id"]}}', '{{formGridHandle["table_id"]}}'].includes(grid_id)) {
if (!$(e.target.hash).is(':visible')) {
return; // prevents the selectpicker from being moved into hidden tabs
}
const header = $("#" + grid_id + "-header"); const header = $("#" + grid_id + "-header");
const $actionBar = header.find('.actionBar'); const $actionBar = header.find('.actionBar');
if ($actionBar.length) { if ($actionBar.length) {
$('#add_filter_container').detach().insertBefore($actionBar.find('.search')).show(); $('#add_filter_container').detach().insertAfter($actionBar.find('.search')).show();
} }
} }
@ -447,9 +451,6 @@
</script> </script>
<style> <style>
#add_filter_container {
float: left;
}
.actions .dropdown-menu.pull-right { .actions .dropdown-menu.pull-right {
max-height: 400px; max-height: 400px;
min-width: max-content; min-width: max-content;
@ -462,20 +463,26 @@
font-size: 16px; font-size: 16px;
font-style: italic; font-style: italic;
} }
#reverseFilterClear { #add_filter_container {
border-right: none; display: flex;
gap: 8px;
} }
#add_filter_container .bootstrap-select > .dropdown-toggle { @media (max-width: 1024px) {
border-top-left-radius: 0; #reverseFilterClear {
border-bottom-left-radius: 0; flex: 1 1 100%;
}
#reverseFilter {
flex: 1 1 100%;
}
} }
</style> </style>
<div id="add_filter_container" class="btn-group" style="display: none;"> <div id="add_filter_container" class="btn-group" style="display: none;">
<button type="button" id="reverseFilterClear" class="btn btn-default" title="{{ lang._('Clear Selection') }}"> <button type="button" id="reverseFilterClear" class="btn btn-default" title="{{ lang._('Clear Selection') }}">
<i id="reverseFilterIcon" class="fa fa-fw fa-filter"></i> <i id="reverseFilterIcon" class="fa fa-fw fa-filter"></i>
</button> </button>
<select id="reverseFilter" class="selectpicker form-control" multiple data-live-search="true" data-width="300px" data-size="10" data-container="body" title="{{ lang._('Filter by Domain') }}"> <select id="reverseFilter" class="selectpicker form-control" multiple data-live-search="true" data-width="200px" data-size="10" data-container="body" title="{{ lang._('Filter by Domain') }}">
</select> </select>
</div> </div>