From 21ba4f33941624f42263ee9a2c0d577f78ff4862 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 3 Jun 2016 10:27:38 +1200 Subject: [PATCH] Make editibility of switch columns be configurable --- domain-server/resources/describe-settings.json | 6 ++++++ domain-server/resources/web/settings/js/settings.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index b82a3ae1b1..6ddc75bcef 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -110,36 +110,42 @@ "name": "id_can_connect", "label": "Connect", "type": "checkbox", + "editable": true, "default": true }, { "name": "id_can_adjust_locks", "label": "Lock/Unlock", "type": "checkbox", + "editable": true, "default": false }, { "name": "id_can_rez", "label": "Rez", "type": "checkbox", + "editable": true, "default": false }, { "name": "id_can_rez_tmp", "label": "Rez Temp", "type": "checkbox", + "editable": true, "default": false }, { "name": "id_can_write_to_asset_server", "label": "Write Assets", "type": "checkbox", + "editable": true, "default": false }, { "name": "id_can_connect_past_max_capacity", "label": "Ignore Max Capacity", "type": "checkbox", + "editable": true, "default": false } ] diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index 6f6e1c9bd5..0e34f1af24 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -972,7 +972,7 @@ function makeTable(setting, keypath, setting_value, isLocked) { colName = keypath + "." + rowIndexOrName + "." + col.name; } - if (isArray && col.type === "checkbox") { + if (isArray && col.type === "checkbox" && col.editable) { html += "" html += "