Add custom attributes to filters

Author: Terzi Eduard

publishes/views/fields/image/index.blade.php

@@ -6,4 +6,4 @@
     'height' => 60,
 ];
 ?>
-{!! \admin\output\staplerImage($attachment, 'original', $attributes) !!}
+{!! \admin\output\staplerImage($attachment, 'original', $attributes) !!}

publishes/views/filters/enum.blade.php

@@ -1,7 +1,7 @@
 @if ('datalist' === $field->type)
-    {!! Form::text($field->name(), $field->value(), ['id' => $field->id(), 'class' => 'form-control', 'list' => "scaffold_{$field->id()}"]) !!}
+    {!! Form::text($field->name(), $field->value(), ['id' => $field->id(), 'list' => "scaffold_{$field->id()}"] + $attributes) !!}
     {!! Form::datalist("scaffold_{$field->id()}", $field->options) !!}
 @else
-    {{ Form::select($field->name(), ($field->isArray ? [] : ['' => "—"]) + ($field->options ?? []), $field->value(), ['class' => 'form-control', 'multiple' => $field->isArray] + $attributes) }}
+    {{ Form::select($field->name(), ($field->isArray ? [] : ['' => "—"]) + ($field->options ?? []), $field->value(), ['multiple' => $field->isArray] + $attributes) }}
 @endif
 

publishes/views/filters/number.blade.php

@@ -1 +1 @@
-{{ Form::number($field->name(), $field->value(), ['class' => 'form-control'] + $attributes) }}
+{{ Form::number($field->name(), $field->value(), $attributes) }}

publishes/views/filters/text.blade.php

@@ -4,8 +4,8 @@
         <div class="input-group-addon" style="padding: 0 8px;">
             {!! Form::select($modeName, $modes, request($modeName)) !!}
         </div>
-        {{ Form::text($field->name(), $field->value(), ['class' => 'form-control']) }}
+        {{ Form::text($field->name(), $field->value(), $attributes) }}
     </div>
 @else
-    {{ Form::text($field->name(), $field->value(), ['class' => 'form-control']) }}
+    {{ Form::text($field->name(), $field->value(), $attributes) }}
 @endif

src/Field/Field.php

@@ -243,14 +243,6 @@ final public function render(string $page = 'index')
         return View::make($this->template($page, 'Key'), $data);
     }
 
-    /**
-     * @return array
-     */
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
     /**
      * @param string $page
      * @param string|null $field

src/Filter/Filter.php

@@ -107,7 +107,7 @@ public function render()
     {
         return View::make($this->template(), [
                 'field' => $this,
-                'attributes' => $this->attributes,
+                'attributes' => $this->getAttributes(),
             ] + $this->renderWith());
     }
 

src/Traits/Form/HasHtmlAttributes.php

@@ -17,6 +17,14 @@ public function setAttributes(array $attributes)
         return $this;
     }
 
+    /**
+     * @return array
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
+
     /**
      * @param float $min
      * @return static

src/helpers.php

@@ -6,8 +6,8 @@
         /**
          * Build a new array using a callback (Original method was deprecetad since version 5.2).
          *
-         * @param  array  $array
-         * @param  callable  $callback
+         * @param array $array
+         * @param callable $callback
          * @return array
          */
         function array_build($array, callable $callback)
@@ -101,7 +101,7 @@ function table_indexes(Model $model, $withTranslated = true)
         /**
          * Check if we are on desired connection or get the current connection name.
          *
-         * @param  string  $name
+         * @param string $name
          * @return mixed string|boolean
          */
         function connection($name = null)
@@ -138,7 +138,7 @@ function enum_values($table, $column)
         /**
          * @param $values
          * @param $column
-         * @param  mixed  $namespace
+         * @param mixed $namespace
          * @return array
          */
         function translated_values($values, $namespace, $column)
@@ -169,9 +169,9 @@ function translated_values($values, $namespace, $column)
         /**
          * Fetch key => value pairs from an Eloquent model.
          *
-         * @param  mixed  $model
-         * @param  string  $labelAttribute
-         * @param  string  $keyAttribute
+         * @param mixed $model
+         * @param string $labelAttribute
+         * @param string $keyAttribute
          * @return array
          */
         function html_list($model, $labelAttribute = 'name', $keyAttribute = 'id')
@@ -189,7 +189,7 @@ function html_list($model, $labelAttribute = 'name', $keyAttribute = 'id')
          * Generate route with query string.
          *
          * @param       $route
-         * @param  array  $params
+         * @param array $params
          * @return string
          */
         function qsRoute($route = null, array $params = [])
@@ -293,7 +293,7 @@ function auto_p($value, $lineBreaks = true)
          * Ensures that the contents of a <<pre>>...<</pre>> HTML block are not
          * converted into paragraphs or line-breaks.
          *
-         * @param  array|string  $matches  The array or string
+         * @param array|string $matches The array or string
          * @return string the pre block without paragraph/line-break conversion
          */
         function clean_pre($matches)
@@ -314,7 +314,7 @@ function clean_pre($matches)
         /**
          * Newline preservation help function for wpautop.
          *
-         * @param  array  $matches  preg_replace_callback matches array
+         * @param array $matches preg_replace_callback matches array
          * @returns string
          * @return mixed
          * @since  3.1.0
@@ -350,9 +350,9 @@ function boolean($value)
     }
 
     /**
-     * @param  string  $name
+     * @param string $name
      * @param $value
-     * @param  string  $key
+     * @param string $key
      * @return string
      */
     function rank(string $name, $value, string $key)
@@ -361,23 +361,23 @@ function rank(string $name, $value, string $key)
     }
 
     /**
-     * @param  string  $image
-     * @param  array  $attributes
+     * @param string $image
+     * @param array $attributes
      * @return string
      */
     function image(string $image, array $attributes = [])
     {
         $attributes = \admin\helpers\html_attributes($attributes);
 
-        return $image ? '<img src="'.$image.'" '.$attributes.' />' : '';
+        return $image ? '<img src="'.($image ?? asset('images/no-image.png')).'" '.$attributes.' />' : '';
     }
 
     /**
      * Output image from Paperclip attachment object.
      *
-     * @param  null|Attachment  $attachment
-     * @param  null|string  $style
-     * @param  array  $attributes
+     * @param null|Attachment $attachment
+     * @param null|string $style
+     * @param array $attributes
      * @return null|string
      */
     function staplerImage(Attachment $attachment = null, string $style = null, $attributes = [])
@@ -432,8 +432,8 @@ function staplerImage(Attachment $attachment = null, string $style = null, $attr
     }
 
     /**
-     * @param  array  $items
-     * @param  null|Closure  $callback
+     * @param array $items
+     * @param null|Closure $callback
      * @return array|string
      */
     function _prepare_collection(array $items, Closure $callback = null)
@@ -454,8 +454,8 @@ function _prepare_collection(array $items, Closure $callback = null)
     }
 
     /**
-     * @param  string  $label
-     * @param  string  $class
+     * @param string $label
+     * @param string $class
      * @return string
      */
     function label(string $label = '', string $class = 'label-success')
@@ -464,8 +464,8 @@ function label(string $label = '', string $class = 'label-success')
     }
 
     /**
-     * @param  string  $label
-     * @param  string  $class
+     * @param string $label
+     * @param string $class
      * @return string
      */
     function badge(string $label = '', string $class = 'bg-green')