fixed prefixedValue

moonshine-software · Dec 2, 2022 · af2ba8a · af2ba8a
1 parent c9aef2f
commit af2ba8a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Resources/Resource.php b/src/Resources/Resource.php
@@ -17,6 +17,7 @@
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 use Leeto\MoonShine\Actions\Action;
+use Leeto\MoonShine\Actions\FiltersAction;
 use Leeto\MoonShine\Contracts\Actions\ActionContract;
 use Leeto\MoonShine\Contracts\HtmlViewable;
 use Leeto\MoonShine\Contracts\Resources\ResourceContract;
@@ -240,10 +241,23 @@ public function getActions(): Collection
     {
         $actions = collect();
 
+        $hasFilters = false;
+
         foreach ($this->actions() as $action) {
+            if($action instanceof FiltersAction) {
+                $hasFilters = true;
+            }
+
             $actions->add($action->setResource($this));
         }
 
+        if(!$hasFilters && !empty($this->filters())) {
+            $actions->add(
+                FiltersAction::make(trans('moonshine::ui.filters'))
+                    ->setResource($this)
+            );
+        }
+
         return $actions;
     }
 

diff --git a/src/Traits/Fields/FileTrait.php b/src/Traits/Fields/FileTrait.php
@@ -143,9 +143,9 @@ public function formViewValue(Model $item): mixed
         return $this->prefixedValue($item->{$this->field()});
     }
 
-    protected function prefixedValue(string $value): string
+    protected function prefixedValue(?string $value): string
     {
-        return ltrim($value, $this->withPrefix);
+        return $value ? ltrim($value, $this->withPrefix) : '';
     }
 
     public function exportViewValue(Model $item): string