refactored in the case module has different name from model

area17 · Mar 22, 2024 · dc2e5ca · dc2e5ca
1 parent d0cc397
commit dc2e5ca
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/Helpers/modules_helpers.php b/src/Helpers/modules_helpers.php
@@ -51,7 +51,11 @@ function getModelByModuleName($moduleName)
 if (!function_exists('getModuleNameByModel')) {
     function getModuleNameByModel($model)
     {
-        return Str::plural(lcfirst(class_basename($model)));
+        try {
+            return TwillCapsules::getCapsuleForModel($model)->getModule();
+        } catch (NoCapsuleFoundException) {
+            return Str::plural(lcfirst(class_basename($model)));
+        }
     }
 }
 

diff --git a/src/Repositories/Behaviors/HandleBlocks.php b/src/Repositories/Behaviors/HandleBlocks.php
@@ -465,16 +465,11 @@ protected function getBlockBrowsers($block)
 
                 $items = Collection::make(array_values($sortedRelatedItems))->filter(function ($value) {
                     return is_object($value);
-                })->map(function ($relatedElement) use ($relation) {
+                })->map(function ($relatedElement) {
                     return [
                             'id' => $relatedElement->id,
                             'name' => $relatedElement->titleInBrowser ?? $relatedElement->title,
-                            'edit' => moduleRoute(
-                                $relation,
-                                config('twill.block_editor.browser_route_prefixes.' . $relation),
-                                'edit',
-                                $relatedElement->id
-                            ),
+                            'edit' => $this->getAdminEditUrl($relatedElement),
                         ] + (classHasTrait($relatedElement, HasMedias::class) ? [
                             'thumbnail' => $relatedElement->defaultCmsImage(['w' => 100, 'h' => 100]),
                         ] : []);

diff --git a/src/Repositories/Behaviors/HandleBrowsers.php b/src/Repositories/Behaviors/HandleBrowsers.php
@@ -243,20 +243,17 @@ public function getFormFieldsForRelatedBrowser($object, $relation, $titleKey = '
      * @param $object
      * @return mixed|string
      */
-    private function getAdminEditUrl($object): mixed
+    public function getAdminEditUrl($object): mixed
     {
         if (!empty($object->adminEditUrl)) {
             return $object->adminEditUrl;
         }
 
-        $relatedType = $object->getRelation('pivot')->related_type;
-        $relation = str_contains($relatedType, '\\')
-            ? getModuleNameByModel($relatedType)
-            : $relatedType;
+        $module = getModuleNameByModel($object);
 
         return moduleRoute(
-            $relation,
-            config('twill.block_editor.browser_route_prefixes.' . $relation),
+            $module,
+            config('twill.block_editor.browser_route_prefixes.' . $module),
             'edit',
             $object->id
         );