1 files changed, 15 insertions, 19 deletions

diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index ecd74b74f8a..b1dbe73cdf7 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -3,13 +3,18 @@ module Boards
     class ListService < Boards::BaseService
       def execute
         issues = IssuesFinder.new(current_user, filter_params).execute
-        issues = without_board_labels(issues) unless movable_list? || closed_list?
-        issues = with_list_label(issues) if movable_list?
+        issues = filter(issues)
         issues.order_by_position_and_priority
       end
 
       private
 
+      def filter(issues)
+        issues = without_board_labels(issues) unless list&.movable? || list&.closed?
+        issues = with_list_label(issues) if list&.label?
+        issues
+      end
+
       def board
         @board ||= parent.boards.find(params[:board_id])
       end
@@ -20,21 +25,10 @@ module Boards
         @list = board.lists.find(params[:id]) if params.key?(:id)
       end
 
-      def movable_list?
-        return @movable_list if defined?(@movable_list)
-
-        @movable_list = list.present? && list.movable?
-      end
-
-      def closed_list?
-        return @closed_list if defined?(@closed_list)
-
-        @closed_list = list.present? && list.closed?
-      end
-
       def filter_params
         set_parent
         set_state
+        set_scope
 
         params
       end
@@ -51,6 +45,10 @@ module Boards
         params[:state] = list && list.closed? ? 'closed' : 'opened'
       end
 
+      def set_scope
+        params[:include_subgroups] = board.group_board?
+      end
+
       def board_label_ids
         @board_label_ids ||= board.lists.movable.pluck(:label_id)
       end
@@ -58,7 +56,7 @@ module Boards
       def without_board_labels(issues)
         return issues unless board_label_ids.any?
 
-        issues.where.not(issues_label_links.limit(1).arel.exists)
+        issues.where.not('EXISTS (?)', issues_label_links.limit(1))
       end
 
       def issues_label_links
@@ -66,10 +64,8 @@ module Boards
       end
 
       def with_list_label(issues)
-        issues.where(
-          LabelLink.where("label_links.target_type = 'Issue' AND label_links.target_id = issues.id")
-                   .where("label_links.label_id = ?", list.label_id).limit(1).arel.exists
-        )
+        issues.where('EXISTS (?)', LabelLink.where("label_links.target_type = 'Issue' AND label_links.target_id = issues.id")
+                                            .where("label_links.label_id = ?", list.label_id).limit(1))
       end
     end
   end