diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 2314a0551c..397c7fe6d0 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -104,10 +104,21 @@ "caption": "Standard Permissions", "can_add_new_rows": false, + "groups": [ + { + "label": "User / Group", + "span": 1 + }, + { + "label": "Permissions", + "span": 6 + } + ], + "columns": [ { "name": "permissions_id", - "label": "User / Group" + "label": "" }, { "name": "id_can_connect", @@ -162,10 +173,21 @@ "caption": "Permissions for Specific Users", "can_add_new_rows": true, + "groups": [ + { + "label": "User / Group", + "span": 1 + }, + { + "label": "Permissions", + "span": 6 + } + ], + "columns": [ { "name": "permissions_id", - "label": "User / Group" + "label": "" }, { "name": "id_can_connect", diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index 71abae76f8..97da975748 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -931,6 +931,22 @@ function makeTable(setting, keypath, setting_value, isLocked) { html += "" + setting.caption + "" } + // Column groups + if (setting.groups) { + html += "" + _.each(setting.groups, function (group) { + html += "" + group.label + "" + }) + if (!isLocked && !setting.read_only) { + if (setting.can_order) { + html += ""; + } + html += "" + } + html += "" + } + // Column names html += ""