StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/api-v1

Browse source
This commit is contained in:
Dane Everitt 2017-11-26 13:22:25 -06:00
commit 4c57b5e8ee
21 changed files with 125 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/Models/DatabaseHost.php
View file

@ -63,14 +63,13 @@ class DatabaseHost extends Model implements CleansAttributes, ValidableContract
'host' => 'required',
'port' => 'required',
'username' => 'required',
'node_id' => 'sometimes|required',
'node_id' => 'sometimes',
];
/**
* Validation rules to assign to this model.
*
* @var array
* @todo the node_id field doesn't validate correctly if no node is provided in request
*/
protected static $dataIntegrityRules = [
'name' => 'string|max:255',
@ -78,7 +77,7 @@ class DatabaseHost extends Model implements CleansAttributes, ValidableContract
'port' => 'numeric|between:1,65535',
'username' => 'string|max:32',
'password' => 'nullable|string',
'node_id' => 'nullable|exists:nodes,id',
'node_id' => 'nullable|integer|exists:nodes,id',
];
/**