jqh 5 years ago
parent
commit
f8a02dbb67
4 changed files with 8 additions and 18 deletions
  1. 2 4
      src/Controllers/UserController.php
  2. 2 2
      src/Form/Builder.php
  3. 1 5
      src/Form/Field.php
  4. 3 7
      src/Scaffold/FormCreator.php

+ 2 - 4
src/Controllers/UserController.php

@@ -275,10 +275,8 @@ class UserController extends Controller
                 return array_column($v, 'id');
             });
 
-        if ($id) {
-            $form->display('created_at', trans('admin.created_at'));
-            $form->display('updated_at', trans('admin.updated_at'));
-        }
+        $form->display('created_at', trans('admin.created_at'));
+        $form->display('updated_at', trans('admin.updated_at'));
 
         $form->saving(function (Form $form) {
             if ($form->password && $form->model()->get('password') != $form->password) {

+ 2 - 2
src/Form/Builder.php

@@ -668,7 +668,7 @@ class Builder
      */
     protected function removeReservedFields()
     {
-        if (!$this->isMode(static::MODE_CREATE)) {
+        if (! $this->isMode(static::MODE_CREATE)) {
             return;
         }
 
@@ -678,7 +678,7 @@ class Builder
             $this->form->getRepository()->getUpdatedAtColumn(),
         ];
 
-        $this->fields = $this->fields()->reject(function (Field $field) use ($reservedColumns) {
+        $this->fields = $this->fields()->reject(function (Field $field) use (&$reservedColumns) {
             return in_array($field->column(), $reservedColumns);
         });
     }

+ 1 - 5
src/Form/Field.php

@@ -1077,11 +1077,7 @@ class Field implements Renderable
      */
     protected function shouldRender()
     {
-        if (!$this->display) {
-            return false;
-        }
-
-        return true;
+        return $this->display;
     }
 
     /**

+ 3 - 7
src/Scaffold/FormCreator.php

@@ -18,9 +18,7 @@ trait FormCreator
 
         $rows = [
             <<<EOF
-if (\$id) {
-            \$form->display('{$primaryKey}');
-        }
+\$form->display('{$primaryKey}');
 EOF
 
         ];
@@ -35,10 +33,8 @@ EOF
         if ($timestamps) {
             $rows[] = <<<EOF
         
-        if (\$id) {
-            \$form->display('created_at');
-            \$form->display('updated_at');
-        }
+        \$form->display('created_at');
+        \$form->display('updated_at');
 EOF;
         }