diff --git a/CHANGELOG.md b/CHANGELOG.md index 818b4a34..96c1b626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # v1.10.0-rc.2 ## mm/dd/2019 +1. [](#improved) + * Improved `permissions` field to add support for displaying calculated permissions 1. [](#bugfix) * Fixed `permissions` field with nested permissions diff --git a/languages/en.yaml b/languages/en.yaml index 9c0a4760..576c89ab 100644 --- a/languages/en.yaml +++ b/languages/en.yaml @@ -851,3 +851,11 @@ PLUGIN_ADMIN: SANITIZE_SVG: "Sanitize SVG" SANITIZE_SVG_HELP: "Removes any XSS code from SVG" ACCOUNTS: "Accounts" + USER_ACCOUNTS: "User Accounts" + USER_GROUPS: "User Groups" + GROUP_NAME: "Group Name" + DISPLAY_NAME: "Display Name" + ICON: "Icon" + ACCESS: "Access" + NO_ACCESS: "No Access" + SUPER_USER: "Super User" diff --git a/themes/grav/templates/forms/fields/permissions/permissions.html.twig b/themes/grav/templates/forms/fields/permissions/permissions.html.twig index 08d428c8..d25f51e2 100644 --- a/themes/grav/templates/forms/fields/permissions/permissions.html.twig +++ b/themes/grav/templates/forms/fields/permissions/permissions.html.twig @@ -20,19 +20,24 @@ {% set permissions = permissions|merge({(existing_key): 'boolean'}) %} {% endif %} {% endfor %} + {% set super = object.authorize('admin.super', 'test') %}