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

Updated code for Grav 1.7.0-rc.4

Browse Source
This commit is contained in:
Matias Griese
2020-01-30 11:02:32 +02:00
parent 7f7afc5344
commit 6abcdae5d6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/plugin/Admin.php
View File

@@ -145,8 +145,8 @@ class Admin
$user = $grav['user']; $user = $grav['user'];
if ($flex && !$user instanceof FlexObjectInterface) { if ($flex && !$user instanceof FlexObjectInterface) {
$managed = !method_exists($flex, 'isManaged') || $flex->isManaged('grav-accounts'); $managed = !method_exists($flex, 'isManaged') || $flex->isManaged('user-accounts');
$directory = $managed ? $flex->getDirectory('grav-accounts') : null; $directory = $managed ? $flex->getDirectory('user-accounts') : null;
/** @var UserObject|null $test */ /** @var UserObject|null $test */
$test = $directory ? $directory->getObject($user->username) : null; $test = $directory ? $directory->getObject($user->username) : null;
if ($test) { if ($test) {
@@ -1182,7 +1182,7 @@ class Admin
{ {
/** @var Flex $flex */ /** @var Flex $flex */
$flex = $this->grav['flex_objects'] ?? null; $flex = $this->grav['flex_objects'] ?? null;
$directory = $flex ? $flex->getDirectory('grav-pages') : null; $directory = $flex ? $flex->getDirectory('pages') : null;
if ($directory) { if ($directory) {
return $directory->getIndex()->sort(['timestamp' => 'DESC'])->slice(0, $count); return $directory->getIndex()->sort(['timestamp' => 'DESC'])->slice(0, $count);
} }

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

@@ -24,7 +24,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% elseif field.data_type == 'permissions' %} {% elseif field.data_type == 'permissions' %}
{% set groups = grav.flex.directory('grav-user-groups') %} {% set groups = grav.flex.directory('user-groups') %}
{% set groupsList = [] %} {% set groupsList = [] %}
{% set crudp = { {% set crudp = {
create: { letter: 'C', title: 'Create', value: '' }, create: { letter: 'C', title: 'Create', value: '' },

4
themes/grav/templates/forms/fields/parents/parents.html.twig
View File

@@ -17,8 +17,8 @@
{% set name = (scope ~ field.name)|fieldName %} {% set name = (scope ~ field.name)|fieldName %}
{% if form %} {% if form %}
{% set parent = form.object.parent.title %} {% set parent = form.object.parent.title %}
{% elseif grav['flex_objects'].hasDirectory('grav-pages') %} {% elseif grav['flex_objects'].hasDirectory('pages') %}
{% set directory = grav['flex_objects'].getDirectory('grav-pages') %} {% set directory = grav['flex_objects'].getDirectory('pages') %}
{% set parent = value ? directory.getObject(value|trim('/')).title : '<root>' %} {% set parent = value ? directory.getObject(value|trim('/')).title : '<root>' %}
{% else %} {% else %}
{% do admin.enablePages() %} {% do admin.enablePages() %}