From c2544d40b4239a068b6b433a0d9cb4641ecefb36 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Sat, 4 Apr 2020 21:24:53 -0600 Subject: [PATCH 1/2] Fixed bug from relation controller customization improvements PR --- modules/backend/behaviors/RelationController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php index 43d926df6..34aca6050 100644 --- a/modules/backend/behaviors/RelationController.php +++ b/modules/backend/behaviors/RelationController.php @@ -1499,12 +1499,12 @@ class RelationController extends ControllerBehavior case 'morphToMany': case 'morphedByMany': case 'belongsToMany': - return ['create', 'add', 'delete', 'remove']; + $buttons = ['create', 'add', 'delete', 'remove']; case 'hasOne': case 'morphOne': case 'belongsTo': - return ['create', 'update', 'link', 'delete', 'unlink']; + $buttons = ['create', 'update', 'link', 'delete', 'unlink']; } } } @@ -1541,7 +1541,7 @@ class RelationController extends ControllerBehavior case 'link': $text = 'backend::lang.relation.link_name'; break; - + case 'unlink': $text = 'backend::lang.relation.unlink'; break; @@ -1618,7 +1618,7 @@ class RelationController extends ControllerBehavior } elseif ($this->manageId) { return 'backend::lang.relation.update_name'; } - + return 'backend::lang.relation.create_name'; } } From ed2d63dd0e6b938d245d039e6e95c84fad8e3bbd Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Sat, 4 Apr 2020 21:41:24 -0600 Subject: [PATCH 2/2] add missing break statements --- modules/backend/behaviors/RelationController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php index 34aca6050..1301fd734 100644 --- a/modules/backend/behaviors/RelationController.php +++ b/modules/backend/behaviors/RelationController.php @@ -1500,11 +1500,13 @@ class RelationController extends ControllerBehavior case 'morphedByMany': case 'belongsToMany': $buttons = ['create', 'add', 'delete', 'remove']; + break; case 'hasOne': case 'morphOne': case 'belongsTo': $buttons = ['create', 'update', 'link', 'delete', 'unlink']; + break; } } }