Skip to content

luci-app-pbr-1.2.2: preserve resolver_set selection on save #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
egc112 merged 1 commit into from
Aug 12, 2026
Merged

luci-app-pbr-1.2.2: preserve resolver_set selection on save #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions htdocs/luci-static/resources/view/pbr/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ return view.extend({
text
);
o.value("none", _("Disabled"));
// Documented fallback for devices where no resolver set support is
// detected; combined with rmempty = false below, the value stored in
// /etc/config/pbr is preserved either way.
o.default = "none";
if (reply.platform.adguardhome_ipset_support) {
o.value("adguardhome.ipset", _("AdGuardHome ipset"));
o.default = "adguardhome.ipset";
Expand All @@ -125,6 +129,16 @@ return view.extend({
o.value("dnsmasq.nftset", _("Dnsmasq nft set"));
o.default = "dnsmasq.nftset";
}
// luci-base commit 974b5864e05ef30f38149389f15583c08bdd4eda
// ("luci-base: form: do not write values equal to the default")
// removes an option whose value equals its default whenever rmempty or
// optional is set:
// https://github.com/openwrt/luci/commit/974b5864e05ef30f38149389f15583c08bdd4eda
// pbr ships resolver_set in /etc/config/pbr, so without rmempty = false
// the stored value would be deleted on the first Save and resolver set
// handling silently disabled. forcewrite is not an alternative here:
// that branch became unreachable in exactly this case.
o.rmempty = false;

o = s.taboption(
"tab_basic",
Expand Down