From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 14 Apr 2020 15:12:47 +0000 (+0200)
Subject: luci-base: tools/widgets.js: honour map readonly property too
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7fc5c4aca614427213e42931257b8e16a0f6af78;p=oweals%2Fluci.git

luci-base: tools/widgets.js: honour map readonly property too

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c89fd0a7f324bb6c0ebd803f542bb63d49e41984)
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
index 38693c5b0..7f724a17e 100644
--- a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
+++ b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
@@ -134,7 +134,7 @@ var CBIZoneSelect = form.ListValue.extend({
 			sort: true,
 			multiple: this.multiple,
 			optional: this.optional || this.rmempty,
-			disabled: this.readonly,
+			disabled: (this.readonly != null) ? this.readonly : this.map.readonly,
 			select_placeholder: E('em', _('unspecified')),
 			display_items: this.display_size || this.size || 3,
 			dropdown_items: this.dropdown_size || this.size || 5,
@@ -389,7 +389,7 @@ var CBINetworkSelect = form.ListValue.extend({
 			sort: true,
 			multiple: this.multiple,
 			optional: this.optional || this.rmempty,
-			disabled: this.readonly,
+			disabled: (this.readonly != null) ? this.readonly : this.map.readonly,
 			select_placeholder: E('em', _('unspecified')),
 			display_items: this.display_size || this.size || 3,
 			dropdown_items: this.dropdown_size || this.size || 5,
@@ -557,7 +557,7 @@ var CBIDeviceSelect = form.ListValue.extend({
 			sort: order,
 			multiple: this.multiple,
 			optional: this.optional || this.rmempty,
-			disabled: this.readonly,
+			disabled: (this.readonly != null) ? this.readonly : this.map.readonly,
 			select_placeholder: E('em', _('unspecified')),
 			display_items: this.display_size || this.size || 3,
 			dropdown_items: this.dropdown_size || this.size || 5,