From 4265c0265104caed2d95254364690a4091a0ce6f Mon Sep 17 00:00:00 2001 From: LT Date: Wed, 8 Jun 2022 12:14:58 +0300 Subject: [PATCH] fixed issue #4 --- src/Resources/MoonShineUserResource.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Resources/MoonShineUserResource.php b/src/Resources/MoonShineUserResource.php index bc0f57f5c..b24b32a7d 100644 --- a/src/Resources/MoonShineUserResource.php +++ b/src/Resources/MoonShineUserResource.php @@ -49,6 +49,7 @@ public function fields(): array Date::make('Дата создания', 'created_at') ->format("d.m.Y") + ->default(now()) ->sortable() ->hideOnForm() ->showOnExport(), @@ -68,8 +69,10 @@ public function rules($item): array return [ 'name' => 'required|min:5', 'moonshine_user_role_id' => 'required', - 'email' => 'sometimes|bail|required|email|unique:moonshine_users,email,'.$item->id, - 'password' => 'sometimes|nullable|min:6|required_with:password_repeat|same:password_repeat', + 'email' => 'sometimes|bail|required|email|unique:moonshine_users,email' . ($item->exists ? ",$item->id" : ''), + 'password' => !$item->exists + ? 'required|min:6|required_with:password_repeat|same:password_repeat' + : 'sometimes|nullable|min:6|required_with:password_repeat|same:password_repeat', ]; }