Fixed crud from issues

balajidharma · Oct 14, 2024 · 124357c · 124357c
1 parent e17ffaa
commit 124357c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
@@ -21,13 +21,15 @@
             <thead>
                 <tr class="bg-base-200">
                     @foreach ($fields as $field)
+                    @if ($field['list'] ?? true)
                     <th class="py-2 px-4 bg-base-50 font-bold uppercase text-sm text-left">
                         @if ($field['sortable'])
                         @include('crud::includes.sort-link', ['label' => $field['label'] ?? $field['attribute'], 'attribute' => $field['attribute']])
                         @else
                         {{ $field['label'] ?? $field['attribute'] }}
                         @endif
                     </th>
+                    @endif
                     @endforeach
                     @canany(['adminUpdate', 'adminDelete'], $model)
                     <th class="py-2 px-4 bg-base-50 font-bold uppercase text-sm text-left">
@@ -40,9 +42,11 @@
             @foreach($items as $item)
                 <tr>
                     @foreach ($fields as $field)
+                    @isset($item->display_values[$field['attribute']])
                     <td class="p-4">
                         {!! $item->display_values[$field['attribute']] !!}
                     </td>
+                    @endisset
                     @endforeach
                     @canany(['adminUpdate', 'adminDelete'], $item)
                     <td class="p-4">

diff --git a/src/Column/LinkColumn.php b/src/Column/LinkColumn.php
@@ -10,10 +10,13 @@ class LinkColumn extends Column
 
     public function renderData($model, $index, $field)
     {
-
+        $value = $model->{$field["attribute"]};
+        if (isset($field['list']['value'])) {
+            $value = $field['list']['value']($model);
+        }
         $url = route($field['list']['route'], $this->getRouteParams($field['list']['route_params'], $model));
 
-        return '<a href="' . $url . '" '.render_form_attributes($field['list']['attr'] ?? []).'>' . $model->{$field["attribute"]} . '</a>';
+        return '<a href="' . $url . '" '.render_form_attributes($field['list']['attr'] ?? []).'>' . $value . '</a>';
     }
 
     protected function getRouteParams($routeParams, $model)

diff --git a/src/CrudBuilder.php b/src/CrudBuilder.php
@@ -44,6 +44,8 @@ class CrudBuilder
 
     public $showFieldErrors = false;
 
+    public $addtional = [];
+
     public function __construct()
     {
         $this->crudHelper = new CrudHelper();
@@ -61,6 +63,11 @@ public function setIdentifier()
         }
     }
 
+    public function setAddtional($addtional)
+    {
+        $this->addtional = array_merge($this->addtional, $addtional);
+    }
+
     public function list($dataProvider)
     {
         if (!($dataProvider instanceof Builder)) {
@@ -389,14 +396,18 @@ public function buildForm()
         foreach ($this->fields as $field) {
             if($field['filable'] && isset($field['label']))
             {
+                $attribute = $field['attribute'];
+                $type = $field['type'];
                 $fieldOptions = isset($field['form_options']) ? $field['form_options']($this->dataProvider) : [];
                 if(!isset($fieldOptions['label']))
                 {
                     $fieldOptions['label'] = $field['label'];
                 }
-                $hideField = $fieldOptions['hide_field'] ?? false;
+                $hideField = $fieldOptions['hide'] ?? false;
+                $type = $fieldOptions['type'] ?? $type;
+                $attribute = $fieldOptions['attribute'] ?? $attribute;
                 if(!$hideField) {
-                    $form->add($field['attribute'], $field['type'], $fieldOptions);
+                    $form->add($attribute, $type, $fieldOptions);
                 }
             }
         }

diff --git a/src/CrudHelper.php b/src/CrudHelper.php
@@ -37,6 +37,7 @@ public function getInputType($columnType)
             'mediumtext' => 'textarea',
             'numeric' => 'number',
             'point' => 'text',
+            'password' => 'password',
             'set' => 'checkbox',
             'smallint' => 'number',
             'string' => 'text',