Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/Console/Actions/SyncSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public function syncSettingFields(Section $section, $fields = [])
'help' => $item['description'] ?? '',
'order' => ++$order,
'validation' => $this->determineValidation($item),
'settings' => array_merge($fieldtype->getSettings(), [
'settings' => array_merge($fieldtype->getSettings(), ($item['settings'] ?? []), [
'default' => $item['default'] ?? '',
'override' => $item['override'] ?? false,
'options' => $this->formatSettingOptions($item['options'] ?? []),
Expand Down Expand Up @@ -193,11 +193,10 @@ private function formatSettingOptions($options = [])
*/
private function determineValidation($setting): array
{
if (!isset($setting['required'])) {
return [];
if (isset($setting['required']) && $setting['required'] === true) {
return ['value' => 'required'];
}

return $setting['required'] === true ? ['value' => 'required'] : [];
return ['value' => null];
}

/**
Expand Down
3 changes: 3 additions & 0 deletions src/Http/Controllers/API/SettingController.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ public function update(SettingRequest $request, Setting $setting)
foreach ($setting->blueprint->relationships() as $relationship) {
$relationship->type()->persistRelationship($setting->settings, $relationship);
}

// Let new setting to take effect after the value of setting is updated
cache()->flush();
}


Expand Down
2 changes: 1 addition & 1 deletion src/Providers/FusionServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ private function registerAddonManifest()
*/
private function registerProviders()
{
$this->app->register(FieldtypeServiceProvider::class);
$this->app->register(BladeServiceProvider::class);
$this->app->register(ConfigServiceProvider::class);
$this->app->register(EventServiceProvider::class);
$this->app->register(FieldtypeServiceProvider::class);
$this->app->register(MenuServiceProvider::class);
$this->app->register(SettingServiceProvider::class);
$this->app->register(ThemeServiceProvider::class);
Expand Down