fixed issue #4

moonshine-software · Jun 8, 2022 · 4265c02 · 4265c02
1 parent 3ac2f99
commit 4265c02
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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',
         ];
     }