Merge branch 'develop' into audio-preset-group

riadvice · Jul 24, 2023 · 93bfbad · 93bfbad
2 parents 37e24ab + 8ddbbde
commit 93bfbad
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 41 deletions.
diff --git a/bbbeasy-backend/app/src/Models/Preset.php b/bbbeasy-backend/app/src/Models/Preset.php
@@ -217,7 +217,9 @@ public function getPresetSettings(): array
                 $presetSett = new PresetSetting();
 
                 foreach ($attributes as $attribute) {
-                    $presetSettings = $presetSett->getByName($attribute);
+
+                    $presetSettings = $presetSett->getByNameAndGroup($attribute,$categoryName);
+
                     if (!$presetSettings->dry() && $presetSettings->enabled) {
                         if (!$settings[$categoryName]) {
                             $settings += [$categoryName => [$presetSettings->name => '']];

diff --git a/bbbeasy-backend/app/src/Models/PresetSetting.php b/bbbeasy-backend/app/src/Models/PresetSetting.php
@@ -126,6 +126,14 @@ public function getByName(string $name): self
         return $this;
     }
 
+    public function getByNameAndGroup(string $name,string $group): self
+    {
+        $this->load(['name = ? and group = ? ', $name,$group]);
+
+        return $this;
+    }
+
+
     public function savePresetSettings(array $presets): bool|string
     {
         foreach ($presets as $preset) {