Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5111 from joshuadwire/v5-develop

Browse Source 
Fix request validation for preconfigured installs
This commit is contained in:
David Bomba 2021-03-13 14:58:23 +11:00 committed by GitHub
commit d01b97104a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Requests/Setup/StoreSetupRequest.php
View File

@ -27,14 +27,9 @@ class StoreSetupRequest extends Request
public function rules() public function rules()
{ {
return [ $rules = [
/*System*/ /*System*/
'url' => 'required', 'url' => 'required',
/*Database*/
'db_host' => 'required',
'db_database' => 'required',
'db_username' => 'required',
'db_password' => '',
/*Mail driver*/ /*Mail driver*/
'mail_driver' => 'required', 'mail_driver' => 'required',
'encryption' => 'required_unless:mail_driver,log', 'encryption' => 'required_unless:mail_driver,log',
@ -51,6 +46,18 @@ class StoreSetupRequest extends Request
'email' => 'required|email:rfc,dns', 'email' => 'required|email:rfc,dns',
'password' => 'required', 'password' => 'required',
]; ];
if ( ! config( 'ninja.preconfigured_install' ) ) {
$rules = array_merge( $rules, [
/*Database*/
'db_host' => 'required',
'db_database' => 'required',
'db_username' => 'required',
'db_password' => '',
] );
}
return $rules;
} }
protected function prepareForValidation() protected function prepareForValidation()