|
|
@@ -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']);
|
|
|
|