From: Florian Eckert <redacted>
Date: Wed, 30 Jun 2021 12:58:14 +0000 (+0200)
Subject: luci-app-acl: unset read and write before acl set
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f4e8fcb6b53780bd2d126b22a89c379cd7c071d7;p=openwrt-luci.git

luci-app-acl: unset read and write before acl set

If the setting in the view is set to `denied`, only the read list option
is deleted. This is not correct. The write list option must also be
deleted. To ensure that the correct configuration is saved, the write
and read list options are always deleted beforehand and then rewritten.

Signed-off-by: Florian Eckert <redacted>
---

diff --git a/applications/luci-app-acl/htdocs/luci-static/resources/view/system/acl.js b/applications/luci-app-acl/htdocs/luci-static/resources/view/system/acl.js
index 618facd6e6..8d1086f754 100644
--- a/applications/luci-app-acl/htdocs/luci-static/resources/view/system/acl.js
+++ b/applications/luci-app-acl/htdocs/luci-static/resources/view/system/acl.js
@@ -146,6 +146,9 @@ var cbiACLSelect = form.Value.extend({
 	},
 
 	write: function(section_id, value) {
+		uci.unset('rpcd', section_id, 'read');
+		uci.unset('rpcd', section_id, 'write');
+
 		if (L.isObject(value) && Array.isArray(value.read))
 			uci.set('rpcd', section_id, 'read', value.read);