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 <redacted>

diff --git a/applications/luci-app-radicale3/Makefile b/applications/luci-app-radicale3/Makefile
index a59689ad65a89923a5e95f8840777efcd750d8b3..a0af2fc2086a346b057b7ac94ab927d4cf4e3e12 100644 (file)
--- 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 <dfdpublic@wildtechgarden.ca>
 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 75d19ebbe314190db1670ff37e97fe03c0f2b0b9..54fe96a0e85efc7b62072dee2b98d98adb4b3511 100644 (file)
--- 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;