Merge pull request #111 from eminiarts/nova-3.12-fix

Fixed TabsOnEdit not working on Nova 3.12
eminiarts · Oct 10, 2020 · 8b4e778 · 8b4e778
2 parents 8a61797 + a600ce9
commit 8b4e778
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/src/TabsOnEdit.php b/src/TabsOnEdit.php
@@ -4,6 +4,7 @@
 use Laravel\Nova\Fields\FieldCollection;
 use Laravel\Nova\Panel;
 use Laravel\Nova\Http\Requests\NovaRequest;
+use Laravel\Nova\Resource;
 
 trait TabsOnEdit
 {
@@ -138,7 +139,7 @@ public function updateFields(NovaRequest $request)
                 'Tabs' => [
                     'component' => 'tabs',
                     'fields'    => $this->removeNonUpdateFields($request, $this->resolveFields($request)),
-                    'panel'     => Panel::defaultNameForUpdate($request->newResource()),
+                    'panel'     => Panel::defaultNameForUpdate($this->resolveResource($request)),
                 ],
             ]
         );
@@ -161,4 +162,17 @@ protected function assignToPanels($label, FieldCollection $fields)
             return $field;
         });
     }
+
+    /**
+     * @param NovaRequest $request
+     * @return Resource
+     */
+    private function resolveResource(NovaRequest $request)
+    {
+        if ($this instanceof Resource) {
+            return $this;
+        }
+
+        return $request->newResource();
+    }
 }