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

[L6] Update even more areas of codebase using custom model validation logic

Browse source
This commit is contained in:
Dane Everitt 2019-09-04 22:26:28 -07:00
parent c586157dc4
commit 0d6cf54314
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
23 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/Admin/Api/StoreApplicationApiKeyRequest.php
View file

@ -15,7 +15,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
*/
public function rules()
{
$modelRules = ApiKey::getCreateRules();
$modelRules = ApiKey::getRules();
return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];

4
app/Http/Requests/Admin/DatabaseHostFormRequest.php
View file

@ -12,10 +12,10 @@ class DatabaseHostFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() !== 'POST') {
return DatabaseHost::getUpdateRulesForId($this->route()->parameter('host'));
return DatabaseHost::getRulesForUpdate($this->route()->parameter('host'));
}
return DatabaseHost::getCreateRules();
return DatabaseHost::getRules();
}
/**

4
app/Http/Requests/Admin/LocationFormRequest.php
View file

@ -21,9 +21,9 @@ class LocationFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() === 'PATCH') {
return Location::getUpdateRulesForId($this->route()->parameter('location')->id);
return Location::getRulesForUpdate($this->route()->parameter('location')->id);
}
return Location::getCreateRules();
return Location::getRules();
}
}

4
app/Http/Requests/Admin/Node/NodeFormRequest.php
View file

@ -20,10 +20,10 @@ class NodeFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() === 'PATCH') {
return Node::getUpdateRulesForId($this->route()->parameter('node')->id);
return Node::getRulesForUpdate($this->route()->parameter('node'));
}
return Node::getCreateRules();
return Node::getRules();
}
/**

4
app/Http/Requests/Admin/PackFormRequest.php
View file

@ -20,10 +20,10 @@ class PackFormRequest extends AdminFormRequest
public function rules()
{
if ($this->method() === 'PATCH') {
return Pack::getUpdateRulesForId($this->route()->parameter('pack')->id);
return Pack::getRulesForUpdate($this->route()->parameter('pack')->id);
}
return Pack::getCreateRules();
return Pack::getRules();
}
/**

2
app/Http/Requests/Admin/ServerFormRequest.php
View file

@ -21,7 +21,7 @@ class ServerFormRequest extends AdminFormRequest
*/
public function rules()
{
$rules = Server::getCreateRules();
$rules = Server::getRules();
$rules['description'][] = 'nullable';
return $rules;

4
app/Http/Requests/Admin/UserFormRequest.php
View file

@ -12,9 +12,9 @@ class UserFormRequest extends AdminFormRequest
*/
public function rules()
{
$rules = collect(User::getCreateRules());
$rules = collect(User::getRules());
if ($this->method() === 'PATCH') {
$rules = collect(User::getUpdateRulesForId($this->route()->parameter('user')->id))->merge([
$rules = collect(User::getRulesForUpdate($this->route()->parameter('user')))->merge([
'ignore_connection_error' => ['sometimes', 'nullable', 'boolean'],
]);
}