From 47516414ff88e6c0703f20483210f181409e6133 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 22 Nov 2019 14:51:03 +0300 Subject: [PATCH] feat(admin-plugin): add ability to hide fieldsets from entries type select #304 --- .../admin/app/Controllers/EntriesController.php | 10 ++++++++-- .../admin/app/Controllers/FieldsetsController.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index f9bf3227..3f59012f 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -128,7 +128,10 @@ class EntriesController extends Controller foreach ($fieldsets_list as $fieldset) { if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'yaml') { $fieldset_content = $this->parser->decode(Filesystem::read($fieldset['path']), 'yaml'); - if (isset($fieldset_content['sections']) && isset($fieldset_content['sections']['main']) && isset($fieldset_content['sections']['main']['fields'])) { + if (isset($fieldset_content['sections']) && + isset($fieldset_content['sections']['main']) && + isset($fieldset_content['sections']['main']['fields']) && + isset($fieldset_content['sections']['main']['fields']['title'])) { if (isset($fieldset_content['hide']) && $fieldset_content['hide'] == true) { continue; } @@ -285,7 +288,10 @@ class EntriesController extends Controller foreach ($_fieldsets as $fieldset) { if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'yaml') { $fieldset_content = $this->parser->decode(Filesystem::read($fieldset['path']), 'yaml'); - if (isset($fieldset_content['sections']) && isset($fieldset_content['sections']['main']) && isset($fieldset_content['sections']['main']['fields'])) { + if (isset($fieldset_content['sections']) && + isset($fieldset_content['sections']['main']) && + isset($fieldset_content['sections']['main']['fields']) && + isset($fieldset_content['sections']['main']['fields']['title'])) { if (isset($fieldset_content['hide']) && $fieldset_content['hide'] == true) { continue; } diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php index 01c2f089..7e16b35f 100644 --- a/site/plugins/admin/app/Controllers/FieldsetsController.php +++ b/site/plugins/admin/app/Controllers/FieldsetsController.php @@ -82,7 +82,7 @@ class FieldsetsController extends Controller 'hide' => (bool) $data['hide'], 'sections' => [ 'main' => [ - 'title' => 'Main', + 'title' => 'admin_main', 'fields' => [ 'title' => [ 'title' => 'admin_title',