From 9c929f15a4f16a0134981e7bbc8971138b46d8da Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 31 Jan 2020 11:56:03 +0200 Subject: [PATCH] Cleanup acl_picker field --- classes/plugin/Admin.php | 2 +- .../templates/forms/fields/acl_picker/acl_picker.html.twig | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php index ff7159b2..16645e8b 100644 --- a/classes/plugin/Admin.php +++ b/classes/plugin/Admin.php @@ -144,11 +144,11 @@ class Admin /** @var UserInterface $user */ $user = $grav['user']; + // Convert old user to Flex User if Flex Objects plugin has been enabled. if ($flex && !$user instanceof FlexObjectInterface) { $managed = !method_exists($flex, 'isManaged') || $flex->isManaged('user-accounts'); $directory = $managed ? $flex->getDirectory('user-accounts') : null; - // Convert old user to Flex User. /** @var UserObject|null $test */ $test = $directory ? $directory->createObject($user->toArray(), $user->username) : null; if ($test) { diff --git a/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig b/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig index f09059b7..decdd5a0 100644 --- a/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig +++ b/themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig @@ -2,9 +2,7 @@ {% block input %} {% set permissions = grav.permissions %} - {% set access = permissions.access(value) %} {% set tu = grav.twig.twig.filters['tu'] is defined %} - {% set classes = { '': 'status-unchecked', 1: 'status-checked', 0: 'status-indeterminate' } %} {% set states = { '': 0, 1: 1, 0: 2 } %} @@ -86,9 +84,6 @@ - - value: - {{ value|json_encode}} {% for key, access in value %}