Merge branch 'master' of github.com:akaunting/akaunting

This commit is contained in:
Cüneyt Şentürk
2021-06-22 17:48:59 +03:00
15 changed files with 175 additions and 38 deletions

View File

@@ -37,7 +37,7 @@ class User extends FormRequest
$id = is_numeric($this->user) ? $this->user : $this->user->getAttribute('id');
$password = '';
$companies = $this->user->can('read-common-companies') ? 'required' : '';
$roles = $this->user->can('read-auth-roles') ? 'required' : '';
$roles = $this->user->can('read-auth-roles') ? 'required|array' : '';
if ($this->user->contact) {
$email .= '|unique:contacts,NULL,'
@@ -51,7 +51,7 @@ class User extends FormRequest
$id = null;
$password = 'required|';
$companies = 'required';
$roles = 'required';
$roles = 'required|array';
}
$email .= '|unique:users,email,' . $id . ',id,deleted_at,NULL';