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

remove required default value, update descriptions in seeder

Browse source
This commit is contained in:
Dane Everitt 2016-09-14 15:19:59 -04:00
parent c2d0a5adb3
commit fcae6b5f15
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Repositories/ServiceRepository/Variable.php
View file

@ -100,7 +100,7 @@ class Variable
'name' => 'sometimes|required|string|min:1|max:255',
'description' => 'sometimes|required|string',
'env_variable' => 'sometimes|required|regex:/^[\w]{1,255}$/',
'default_value' => 'sometimes|required|string|max:255',
'default_value' => 'sometimes|string|max:255',
'user_viewable' => 'sometimes|required|numeric|size:1',
'user_editable' => 'sometimes|required|numeric|size:1',
'required' => 'sometimes|required|numeric|size:1',
@ -114,7 +114,7 @@ class Variable
$data['default_value'] = (isset($data['default_value'])) ? $data['default_value'] : $variable->default_value;
$data['regex'] = (isset($data['regex'])) ? $data['regex'] : $variable->regex;
if (!preg_match($data['regex'], $data['default_value'])) {
if ($data['default_value'] !== '' && !preg_match($data['regex'], $data['default_value'])) {
throw new DisplayException('The default value you entered cannot violate the regex requirements.');
}