Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-03 20:05:53 +01:00
Code Issues Packages Projects Releases Activity

Cleanup acl_picker field

Browse Source
This commit is contained in:
Matias Griese
2020-01-31 11:56:03 +02:00
parent 58e1cda1d5
commit 9c929f15a4
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/plugin/Admin.php
View File

@@ -144,11 +144,11 @@ class Admin
/** @var UserInterface $user */ /** @var UserInterface $user */
$user = $grav['user']; $user = $grav['user'];
// Convert old user to Flex User if Flex Objects plugin has been enabled.
if ($flex && !$user instanceof FlexObjectInterface) { if ($flex && !$user instanceof FlexObjectInterface) {
$managed = !method_exists($flex, 'isManaged') || $flex->isManaged('user-accounts'); $managed = !method_exists($flex, 'isManaged') || $flex->isManaged('user-accounts');
$directory = $managed ? $flex->getDirectory('user-accounts') : null; $directory = $managed ? $flex->getDirectory('user-accounts') : null;
// Convert old user to Flex User.
/** @var UserObject|null $test */ /** @var UserObject|null $test */
$test = $directory ? $directory->createObject($user->toArray(), $user->username) : null; $test = $directory ? $directory->createObject($user->toArray(), $user->username) : null;
if ($test) { if ($test) {

5
themes/grav/templates/forms/fields/acl_picker/acl_picker.html.twig
View File

@@ -2,9 +2,7 @@
{% block input %} {% block input %}
{% set permissions = grav.permissions %} {% set permissions = grav.permissions %}
{% set access = permissions.access(value) %}
{% set tu = grav.twig.twig.filters['tu'] is defined %} {% set tu = grav.twig.twig.filters['tu'] is defined %}
{% set classes = { '': 'status-unchecked', 1: 'status-checked', 0: 'status-indeterminate' } %} {% set classes = { '': 'status-unchecked', 1: 'status-checked', 0: 'status-indeterminate' } %}
{% set states = { '': 0, 1: 1, 0: 2 } %} {% set states = { '': 0, 1: 1, 0: 2 } %}
@@ -86,9 +84,6 @@
<a href="#" class="button add-item"><i class="fa fa-plus"></i></a> <a href="#" class="button add-item"><i class="fa fa-plus"></i></a>
</div> </div>
value:
{{ value|json_encode}}
{% for key, access in value %} {% for key, access in value %}
<div class="permissions-item" data-field-type="{{ field.data_type }}"> <div class="permissions-item" data-field-type="{{ field.data_type }}">
<a href="#" class="remove-item"><i class="fa fa-trash"></i></a> <a href="#" class="remove-item"><i class="fa fa-trash"></i></a>