jqh 6 lat temu
rodzic
commit
d079572dd0

+ 17 - 9
src/Controllers/UserController.php

@@ -244,15 +244,23 @@ class UserController extends Controller
         $form->text('name', trans('admin.name'))->required();
         $form->image('avatar', trans('admin.avatar'));
 
-        $form->password('password', trans('admin.password'))
-            ->rules('confirmed')
-            ->customFormat(function ($v) {
-                if ($v == $this->password) {
-                    return;
-                }
-                return $v;
-            });
-        $form->password('password_confirmation', trans('admin.password_confirmation'));
+        if ($id) {
+            $form->password('password', trans('admin.password'))
+                ->rules('confirmed')
+                ->customFormat(function ($v) {
+                    if ($v == $this->password) {
+                        return;
+                    }
+                    return $v;
+                });
+            $form->password('password_confirmation', trans('admin.password_confirmation'));
+        } else {
+            $form->password('password', trans('admin.password'))
+                ->required()
+                ->rules('confirmed');
+
+            $form->password('password_confirmation', trans('admin.password_confirmation'));
+        }
 
         $form->ignore(['password_confirmation']);
 

+ 1 - 1
src/Grid/Concerns/Options.php

@@ -33,7 +33,7 @@ trait Options
 
         'export_limit'       => 50000,
         'dialog_form_area'   => ['700px', '670px'],
-        'table_header_style' => 'table-header-default',
+        'table_header_style' => 'table-header-gray',
 
     ];
 

+ 0 - 3
src/Scaffold/FormCreator.php

@@ -38,9 +38,6 @@ EOF
         if (\$id) {
             \$form->display('created_at');
             \$form->display('updated_at');
-        } else {
-            \$form->hidden('created_at');
-            \$form->hidden('updated_at');
         }
 EOF;
         }