fix issue with disappearing columns in admin/email view

clingen-data-model · Nov 29, 2023 · e19f863 · e19f863
1 parent 1abe8e4
commit e19f863
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/Http/Controllers/Admin/EmailCrudController.php b/app/Http/Controllers/Admin/EmailCrudController.php
@@ -43,9 +43,8 @@ public function setup()
         // TODO: remove setFromDb() and manually define Fields and Columns
         $this->crud->setFromDb();
 
-        $this->crud->removeColumns(['cc', 'bcc', 'reply_to', 'sender']);
-        $this->crud->setColumnsDetails(['to'], ['type' => 'json_email']);
-        $this->crud->setColumnsDetails(['from'], ['type' => 'json_email']);
+        $this->crud->removeColumns(['cc', 'bcc', 'reply_to', 'sender', 'body']);
+        $this->crud->setColumnsDetails(['from','to'], ['type' => 'json_email']);
         $this->crud->addColumn(['type' => 'datetime', 'name' => 'created_at', 'label' => 'Sent'])->makeFirstColumn();
 
         $this->crud->orderBy('created_at', 'DESC');
@@ -55,7 +54,7 @@ public function show($id)
     {
         $content = $this->traitShow($id);
         foreach ($content->entry->getAttributes() as $key => $value) {
-            if (is_null($content->entry->{$key})) {
+            if (is_null($value)) {
                 $this->crud->removeColumn($key);
             }
         }