jqh %!s(int64=4) %!d(string=hai) anos
pai
achega
f10cc025c1
Modificáronse 3 ficheiros con 17 adicións e 3 borrados
  1. 1 1
      src/Form/EmbeddedForm.php
  2. 1 1
      src/Form/NestedForm.php
  3. 15 1
      src/Support/Helper.php

+ 1 - 1
src/Form/EmbeddedForm.php

@@ -207,7 +207,7 @@ class EmbeddedForm
      */
     protected function setFieldOriginalValue($key)
     {
-        if (array_key_exists($key, $this->original)) {
+        if (Helper::keyExists($key, $this->original)) {
             $values = $this->original[$key];
 
             $this->fields->each(function (Field $field) use ($values) {

+ 1 - 1
src/Form/NestedForm.php

@@ -190,7 +190,7 @@ class NestedForm extends WidgetForm
     protected function setFieldOriginalValue($key)
     {
         $values = [];
-        if (array_key_exists($key, $this->original)) {
+        if (Helper::keyExists($key, $this->original)) {
             $values = $this->original[$key];
         }
         $this->fields->each(function (Field $field) use ($values) {

+ 15 - 1
src/Support/Helper.php

@@ -2,7 +2,6 @@
 
 namespace Dcat\Admin\Support;
 
-use Dcat\Admin\Admin;
 use Dcat\Admin\Grid;
 use Dcat\Laravel\Database\WhereHasInServiceProvider;
 use Illuminate\Contracts\Support\Arrayable;
@@ -972,4 +971,19 @@ class Helper
 
         return last(explode('/', $name));
     }
+
+    /**
+     * @param string|int $key
+     * @param array|object $arrayOrObject
+     *
+     * @return bool
+     */
+    public static function keyExists($key, $arrayOrObject)
+    {
+        if (is_object($arrayOrObject)) {
+            $arrayOrObject = static::array($arrayOrObject, false);
+        }
+
+        return array_key_exists($key, $arrayOrObject);
+    }
 }