|
@@ -212,19 +212,17 @@ class UserController extends Controller
|
|
|
public function form($id = null)
|
|
|
{
|
|
|
$roleModel = config('admin.database.roles_model');
|
|
|
+ $userTable = config('admin.database.users_table');
|
|
|
+
|
|
|
+ $connection = config('admin.database.connection');
|
|
|
|
|
|
$form = new Form(new Administrator());
|
|
|
|
|
|
$form->display('id', 'ID');
|
|
|
|
|
|
- if (request()->isMethod('POST')) {
|
|
|
- $userTable = config('admin.database.users_table');
|
|
|
- $userNameRules = "required|unique:{$userTable}";
|
|
|
- } else {
|
|
|
- $userNameRules = 'required';
|
|
|
- }
|
|
|
-
|
|
|
- $form->text('username', trans('admin.username'))->rules($userNameRules);
|
|
|
+ $form->text('username', trans('admin.username'))
|
|
|
+ ->creationRules(['required', "unique:{$connection}.{$userTable}"])
|
|
|
+ ->updateRules(['required', "unique:{$connection}.{$userTable},username,$id"]);
|
|
|
$form->text('name', trans('admin.name'))->rules('required');
|
|
|
$form->image('avatar', trans('admin.avatar'));
|
|
|
$form->password('password', trans('admin.password'))->rules('required|confirmed');
|