From b6ee011911c82d886ce2f1179d306064cc1f6a85 Mon Sep 17 00:00:00 2001 From: vikram chand Date: Fri, 23 Apr 2021 11:36:55 +0530 Subject: [PATCH] Fixed: exception of Menu --- Entities/ContentType.php | 4 +++- Entities/MenuItem.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Entities/ContentType.php b/Entities/ContentType.php index ff8bb4a..3fd34cd 100644 --- a/Entities/ContentType.php +++ b/Entities/ContentType.php @@ -336,13 +336,15 @@ public static function getItemWithRelations($id) public static function syncWithFormGroups(ContentType $content_type, $groups_array) { - $stored_groups = $content_type->groups()->get()->pluck('slug')->toArray(); + $stored_groups = $content_type->groups()->get()->pluck('slug','id')->toArray(); $input_groups = collect($groups_array)->pluck('slug')->toArray(); $groups_to_delete = array_diff($stored_groups, $input_groups); if(count($groups_to_delete) > 0) { + $groups_to_delete = array_flip($groups_to_delete); + FormGroup::deleteItems($groups_to_delete); } diff --git a/Entities/MenuItem.php b/Entities/MenuItem.php index 1721855..eb24d5f 100644 --- a/Entities/MenuItem.php +++ b/Entities/MenuItem.php @@ -245,7 +245,7 @@ public static function getHomePage() }]); $menu_item = $menu_item->first(); - if(!$menu_item) + if(!$menu_item || !$menu_item->content) { return false; }