jqh пре 5 година
родитељ
комит
2edd5a18f2

+ 1 - 1
resources/views/form/hasmanytable.blade.php

@@ -1,6 +1,6 @@
 
 <div class="row form-group">
-    <div class="{{$viewClass['label']}} "><h4 class="pull-right"><label class="control-label">{!! $label !!}</label></h4></div>
+    <div class="{{$viewClass['label']}} "><label class="control-label pull-right">{!! $label !!}</label></div>
     <div class="{{$viewClass['field']}}">
         @include('admin::form.error')
 

+ 2 - 2
resources/views/partials/breadcrumb.blade.php

@@ -5,7 +5,7 @@
             @if($loop->last)
                 <li class="active">
                     @if (\Illuminate\Support\Arr::has($item, 'icon'))
-                        <i class="fa fa-{{ $item['icon'] }}"></i>
+                        <i class="fa {{ $item['icon'] }}"></i>
                     @endif
                     {{ $item['text'] }}
                 </li>
@@ -13,7 +13,7 @@
                 <li>
                     <a href="{{ admin_url(\Illuminate\Support\Arr::get($item, 'url')) }}">
                         @if (\Illuminate\Support\Arr::has($item, 'icon'))
-                            <i class="fa fa-{{ $item['icon'] }}"></i>
+                            <i class="fa {{ $item['icon'] }}"></i>
                         @endif
                         {{ $item['text'] }}
                     </a>

+ 2 - 2
src/Form.php

@@ -71,9 +71,9 @@ use Dcat\Admin\Form\Concerns;
  * @method Field\Image          image($column, $label = '')
  * @method Field\MultipleFile   multipleFile($column, $label = '')
  * @method Field\MultipleImage  multipleImage($column, $label = '')
- * @method Field\HasMany        hasMany($column, \Closure $callback)
+ * @method Field\HasMany        hasMany($column, $labelOrCallback, $callback = null)
  * @method Field\Tree           tree($column, $label = '')
- * @method Field\Table          table($column, $callback)
+ * @method Field\Table          table($column, $labelOrCallback, $callback = null)
  * @method Field\ListField      list($column, $label = '')
  * @method Field\Timezone       timezone($column, $label = '')
  * @method Field\KeyValue       keyValue($column, $label = '')

+ 9 - 7
src/Grid/Filter.php

@@ -357,14 +357,12 @@ class Filter implements Renderable
 
     public function withoutBorder()
     {
-        $this->border = '';
-
-        return $this;
+        return $this->withBorder('');
     }
 
-    public function withBorder()
+    public function withBorder($border = null)
     {
-        $this->border = 'border-top:1px solid #f4f4f4;';
+        $this->border = is_null($border) ? 'border-top:1px solid #f4f4f4;' : $border;
 
         return $this;
     }
@@ -372,11 +370,15 @@ class Filter implements Renderable
     /**
      * Remove filter by column.
      *
-     * @param mixed $id
+     * @param string|array $column
      */
     public function removeFilter($column)
     {
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($column) {
+        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use (&$column) {
+            if (is_array($column)) {
+                return ! in_array($filter->getColumn(), $column);
+            }
+
             return $filter->getColumn() != $column;
         });
     }