Fix check if model uses trait in observer

despark · Sep 1, 2016 · 7454f39 · 7454f39
1 parent 19dc6d3
commit 7454f39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/resources/views/admin/formElements/select.blade.php b/resources/views/admin/formElements/select.blade.php
@@ -1,6 +1,6 @@
 <div class="form-group">
     {!! Form::label($fieldName, $options['label']) !!}
-    {!! Form::select($fieldName, [null => 'Select '.$options['label']] + $options['select_options'], $record->{$fieldName}, ['class' => 'form-control']) !!}
+    {!! Form::select($fieldName, [null => 'Select '.$options['label']] + $record->{$options['selectOptions']}(), $record->{$fieldName}, ['class' => 'form-control']) !!}
     <div class="text-red">
         {{ join($errors->get($fieldName), '<br />') }}
     </div>

diff --git a/src/Admin/Observers/AdminObserver.php b/src/Admin/Observers/AdminObserver.php
@@ -16,10 +16,11 @@ class AdminObserver
      */
     public function saving(Model $model)
     {
-        if ($model instanceof UploadImagesTrait) {
+        if (in_array(UploadImagesTrait::class, class_uses($model))) {
             $model->saveImages();
         }
-        if ($model instanceof UploadFilesTrait) {
+
+        if (in_array(UploadFilesTrait::class, class_uses($model))) {
             $model->saveFiles();
         }
     }

diff --git a/src/Console/Commands/Compilers/ResourceCompiler.php b/src/Console/Commands/Compilers/ResourceCompiler.php
@@ -166,7 +166,7 @@ public function render_config($template)
     {
         if ($this->options['image_uploads']) {
             $this->configReplacements[':image_fields'] = "'image_fields' => [
-        'image'  => [
+        'image' => [
             'thumbnails' => [
                 'admin' => [
                     'width' => 150,