cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: [settingProvider] Fixed various UI bug

pull/70/head
mokaddem 2021-07-30 15:12:09 +02:00
parent 82dab54b71
commit fcde68be3f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Model/Table/SettingsProviderTable.php
View File

@ -246,7 +246,7 @@ class SettingsProviderTable extends AppTable
if (empty($notices[$value['severity']])) { if (empty($notices[$value['severity']])) {
$notices[$value['severity']] = []; $notices[$value['severity']] = [];
} }
$notices[$value['severity']][] = $key; $notices[$value['severity']][] = $value;
} }
} else { } else {
$notices = array_merge_recursive($notices, $this->getNoticesFromSettingsConfiguration($value)); $notices = array_merge_recursive($notices, $this->getNoticesFromSettingsConfiguration($value));
@ -263,7 +263,7 @@ class SettingsProviderTable extends AppTable
private function evaluateLeaf($setting, $settingSection) private function evaluateLeaf($setting, $settingSection)
{ {
$skipValidation = false; $skipValidation = false;
if ($setting['type'] == 'select') { if ($setting['type'] == 'select' || $setting['type'] == 'multi-select') {
if (!empty($setting['options']) && is_callable($setting['options'])) { if (!empty($setting['options']) && is_callable($setting['options'])) {
$setting['options'] = $setting['options']($this); $setting['options'] = $setting['options']($this);
} }
@ -339,9 +339,14 @@ class SettingValidator
{ {
if (!empty($value)) { if (!empty($value)) {
return true; return true;
} else if (!empty($setting['default'])) { } else if (isset($setting['default'])) {
$setting['value'] = $setting['default'];
$setting['severity'] = $setting['severity'] ?? 'info'; $setting['severity'] = $setting['severity'] ?? 'info';
return __('Setting is not set, fallback to default value: {0}', $setting['default']); if ($setting['type'] == 'boolean') {
return __('Setting is not set, fallback to default value: {0}', empty($setting['default']) ? 'false' : 'true');
} else {
return __('Setting is not set, fallback to default value: {0}', $setting['default']);
}
} else { } else {
$setting['severity'] = $setting['severity'] ?? 'critical'; $setting['severity'] = $setting['severity'] ?? 'critical';
return __('Cannot be empty. Setting does not have a default value.'); return __('Cannot be empty. Setting does not have a default value.');