Settings without group

visual-ideas · Dec 11, 2022 · 2889959 · 2889959
1 parent ac0d153
commit 2889959
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/stubs/MoonShine/Resources/SettingGroupResource.php.stub b/stubs/MoonShine/Resources/SettingGroupResource.php.stub
@@ -32,7 +32,7 @@ class SettingGroupResource extends Resource
     public function rules(Model $item): array
     {
         return [
-            'slug' => 'required|max:190|regex:/^([a-z0-9\-]+)$/i|unique:laravel_site_setting_groups,slug,' . $item->getKey(),
+            'slug' => 'required|max:190|regex:/^([a-z0-9\-]+)$/i|unique:setting_groups,slug,' . $item->getKey(),
             'hint' => 'nullable|max:190',
         ];
     }

diff --git a/stubs/MoonShine/Resources/SettingResource.php.stub b/stubs/MoonShine/Resources/SettingResource.php.stub
@@ -26,7 +26,8 @@ class SettingResource extends Resource
             ID::make()->sortable(),
             BelongsTo::make(
                 'Group',
-                'setting_group_id'
+                'setting_group_id',
+                new SettingGroupResource()
             )->nullable()->sortable(),
             Text::make('Slug', 'slug')->required()->sortable()->hint('a-z, 0-9, -'),
             Text::make('Hint', 'hint')->nullable()->sortable()->hint('Не используется на сайте, только для удобства администрирования!'),
@@ -39,7 +40,7 @@ class SettingResource extends Resource
     {
         return [
             'setting_group_id' => 'nullable|exists:setting_groups,id',
-            'slug'  => 'required|max:190|regex:/^([a-z0-9\-]+)$/i|unique:laravel_site_setting_groups,slug,' . $item->getKey(),
+            'slug'  => 'required|max:190|regex:/^([a-z0-9\-]+)$/i|unique:setting_groups,slug|unique:settings,slug,' . $item->getKey(),
             'hint'  => 'nullable|max:190',
             'value' => 'required|max:190',
         ];
@@ -55,7 +56,8 @@ class SettingResource extends Resource
         return [
             BelongsTo::make(
                 'Group',
-                'setting_group_id'
+                'setting_group_id',
+                new SettingGroupResource()
             )->nullable(),
         ];
     }