Merge branch 'nightly' of github.com:fusioncms/cms into google-map-settings

Author: kaidesu

src/Console/Actions/SyncSettings.php

@@ -36,6 +36,9 @@ public function handle()
 
         SettingGroup::all()->each(function($group) {
             $this->syncSettingSection($group);
+
+            $group->getBuilder()
+                ->firstOrCreate(['id' => 1, 'setting_id' => $group->id]);
         });
 
         /**

src/Http/Controllers/API/SettingController.php

@@ -43,7 +43,7 @@ public function show(Request $request, Setting $setting)
      */
     public function update(SettingRequest $request, Setting $setting)
     {
-        $setting->settings->update($request->validated());
+        $setting->settings()->update($request->validated());
 
         // persist relationships..
         foreach ($setting->fieldset->relationships() as $relationship) {

src/Models/Setting.php

@@ -54,13 +54,6 @@ public function getTableAttribute()
      */
     public function settings()
     {
-        $name = Str::studly($this->handle);
-        $path = fusion_path("/src/Models/Settings/{$name}.php");
-
-        if (! file_exists($path)) {
-            $this->getBuilder()->firstOrCreate(['id' => 1, 'setting_id' => $this->id]);
-        }
-
-        return $this->hasOne("Fusion\Models\Settings\\{$name}");
+        return $this->hasOne("Fusion\Models\Settings\\" . Str::studly($this->handle));
     }
 }