Some fixes for registering hosts, enable jobs to go to postgres, initial setup fixes

This commit is contained in:
Deon George
2022-03-11 23:49:15 +11:00
parent cf3b1947a4
commit 4ff29e7e43
7 changed files with 38 additions and 5 deletions

View File

@@ -46,7 +46,7 @@ class SystemRegister extends FormRequest
],
($this->so->exists || ($request->action != 'create')) ? [
'location' => 'required|min:3',
'hold' => 'required|boolean',
'sysop' => 'required|min:3',
'phone' => 'nullable|regex:/^([0-9-]+)$/',
'address' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
@@ -57,7 +57,10 @@ class SystemRegister extends FormRequest
'mailer_port' => 'nullable|digits_between:2,5',
'zt_id' => 'nullable|size:10|regex:/^([A-Fa-f0-9]){10}$/|unique:systems,zt_id,'.($this->so->exists ? $this->so->id : 0),
] : [],
$this->so->exists ? ['active' => 'required|boolean'] : [],
$this->so->exists ? [
'active' => 'required|boolean',
'hold' => 'required|boolean',
] : [],
));
}
}