Only show root groups on the dashboard

The children are lazy-loaded when expanding

2 files changed, 3 insertions, 14 deletions

diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb
index 600ef890f39..d14427cd7a7 100644
--- a/app/controllers/dashboard/groups_controller.rb
+++ b/app/controllers/dashboard/groups_controller.rb
@@ -2,19 +2,9 @@ class Dashboard::GroupsController < Dashboard::ApplicationController
   def index
     @sort = params[:sort] || 'id_desc'
 
-    @groups =
-      if params[:parent_id] && Group.supports_nested_groups?
-        parent = Group.find_by(id: params[:parent_id])
-
-        if can?(current_user, :read_group, parent)
-          GroupsFinder.new(current_user, parent: parent).execute
-        else
-          Group.none
-        end
-      else
-        current_user.groups
-      end
-
+    @groups = GroupsFinder.new(current_user, all_available: false).execute
+    # Only show root groups if no parent-id is given
+    @groups = @groups.where(parent_id: params[:parent_id])
     @groups = @groups.search(params[:filter]) if params[:filter].present?
     @groups = @groups.includes(:route)
     @groups = @groups.sort(@sort)
diff --git a/app/finders/group_children_finder.rb b/app/finders/group_children_finder.rb
index 9760f9ef802..6e2e2dfa5a1 100644
--- a/app/finders/group_children_finder.rb
+++ b/app/finders/group_children_finder.rb
@@ -64,7 +64,6 @@ class GroupChildrenFinder
              else
                base_groups
              end
-    groups = groups
     groups.sort(params[:sort]).includes(:route)
   end