From e17bb80a0c6cf40cf7555fa87bb38d739be74117 Mon Sep 17 00:00:00 2001 From: "Daniel F. Dickinson" Date: Sun, 12 Apr 2026 09:53:21 -0400 Subject: [PATCH] luci-app-radicale3: updates for Radicale 3.7.1 Radicale 3.7.1 made some breaking changes to the config, so we need to update the UCI config to match. Signed-off-by: Daniel F. Dickinson (cherry picked from commit 8d4ebf01e7580348aef897f99d00e41bfaefb59b) --- applications/luci-app-radicale3/Makefile | 2 ++ .../htdocs/luci-static/resources/view/radicale3.js | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/luci-app-radicale3/Makefile b/applications/luci-app-radicale3/Makefile index a59689ad65a8..a0af2fc2086a 100644 --- a/applications/luci-app-radicale3/Makefile +++ b/applications/luci-app-radicale3/Makefile @@ -10,6 +10,8 @@ PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Daniel F. Dickinson PROVIDES:=luci-app-radicale2 +EXTRA_DEPENDS:=radicale3 (>= 3.7.1-1) + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-radicale3/htdocs/luci-static/resources/view/radicale3.js b/applications/luci-app-radicale3/htdocs/luci-static/resources/view/radicale3.js index 75d19ebbe314..54fe96a0e85e 100644 --- a/applications/luci-app-radicale3/htdocs/luci-static/resources/view/radicale3.js +++ b/applications/luci-app-radicale3/htdocs/luci-static/resources/view/radicale3.js @@ -453,22 +453,20 @@ return view.extend({ o = s.taboption('main', form.ListValue, 'level', _('Log Level')); s.rmempty = true; o.value('', _('Default (info)')); + o.value('trace', _('Trace')); o.value('debug', _('Debug')); o.value('info', _('Info')); + o.value('notice', _('Notice')); o.value('warning', _('Warning')); o.value('error', _('Error')); o.value('critical', _('Critical')); + o.value('alert', _('Alert')); o.default = ''; // TODO: Add more logging options s.tab('advanced', _('Advanced')); - o = s.taboption('advanced', form.Flag, 'trace_on_debug', _('Trace on debug'), _('Do not filter debug messages starting with \'TRACE\'')); - o.rmempty = true; - o.default = o.disabled; - o.depends('level', 'debug'); - o = s.taboption('advanced', form.Flag, 'mask_passwords', _('Mask Passwords'), _('Redact passwords in logs')); o.rmempty = true; o.default = o.enabled;