CHANGELOG.md

@@ -1,9 +1,5 @@
 # Letzte Änderungen
 
-### 1.10.18
-
--   Fixed: All Gruppen als Option anbieten bei Bedingungen
-
 ### 1.10.17
 
 -   Es können nun auch Bedingungen für Felder vom Typ Gruppierung definiert werden

app/Group/Actions/GroupApiIndexAction.php

@@ -6,7 +6,6 @@ use App\Group;
 use App\Group\Resources\GroupResource;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Lorisleiva\Actions\ActionRequest;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class GroupApiIndexAction
@@ -21,12 +20,8 @@ class GroupApiIndexAction
         return Group::get();
     }
 
-    public function asController(ActionRequest $request, ?Group $group = null): AnonymousResourceCollection
+    public function asController(?Group $group = null): AnonymousResourceCollection
     {
-        return GroupResource::collection(
+        return GroupResource::collection($group ? $group->children()->withCount('children')->get() : Group::where('parent_id', null)->withCount('children')->get());
-            $request->has('all')
-                ? Group::with('children')->get()
-                : ($group ? $group->children()->withCount('children')->get() : Group::where('parent_id', null)->withCount('children')->get())
-        );
     }
 }

resources/js/views/form/Conditions.vue

@@ -176,6 +176,6 @@ if (props.single.links && props.single.links.is_dirty) {
 const groupOptions = ref([]);
 
 onMounted(async () => {
-    groupOptions.value = (await axios.get('/api/group?all')).data.data;
+    groupOptions.value = (await axios.get('/api/group')).data.data;
 });
 </script>