From c89fd0a7f324bb6c0ebd803f542bb63d49e41984 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 14 Apr 2020 17:12:47 +0200
Subject: [PATCH] luci-base: tools/widgets.js: honour map readonly property too
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
.../luci-base/htdocs/luci-static/resources/tools/widgets.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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,
--
2.25.1