فهرست منبع

Merge branch 'master' into 2.0

jqh 4 سال پیش
والد
کامیت
5866ae69aa
3فایلهای تغییر یافته به همراه15 افزوده شده و 5 حذف شده
  1. 9 5
      src/Form/Builder.php
  2. 5 0
      src/Form/Concerns/HasTabs.php
  3. 1 0
      src/Grid/Column/Filter/Equal.php

+ 9 - 5
src/Form/Builder.php

@@ -812,12 +812,16 @@ class Builder
         };
 
         $this->fields = $this->fields()->reject($reject);
-        
-        $this->form->getTab()->getTabs()->transform(function($item) use ($reject) {
-            $item['fields'] = $item['fields']->reject($reject);
 
-            return $item;
-        });
+        if ($this->form->hasTab()) {
+            $this->form->getTab()->getTabs()->transform(function($item) use ($reject) {
+                if (! empty($item['fields'])) {
+                    $item['fields'] = $item['fields']->reject($reject);
+                }
+
+                return $item;
+            });
+        }
     }
 
     /**

+ 5 - 0
src/Form/Concerns/HasTabs.php

@@ -27,6 +27,11 @@ trait HasTabs
         return $this;
     }
 
+    public function hasTab()
+    {
+        return $this->tab ? true : false;
+    }
+
     /**
      * Get Tab instance.
      *

+ 1 - 0
src/Grid/Column/Filter/Equal.php

@@ -113,6 +113,7 @@ class Equal extends Filter
 
     protected function collectAssets()
     {
+        Admin::collectAssets('moment');
         Admin::collectAssets('bootstrap-datetimepicker');
     }
 }