Add a movable scope and a movable? method to List model

2 files changed, 5 insertions, 5 deletions

diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb
index 060982f01f0..c2130273c0c 100644
--- a/app/services/boards/issues/list_service.rb
+++ b/app/services/boards/issues/list_service.rb
@@ -3,8 +3,8 @@ module Boards
     class ListService < Boards::BaseService
       def execute
         issues = IssuesFinder.new(user, filter_params).execute
-        issues = without_board_labels(issues) unless list.label?
-        issues = with_list_label(issues) if list.label?
+        issues = without_board_labels(issues) unless list.movable?
+        issues = with_list_label(issues) if list.movable?
         issues
       end
 
@@ -40,7 +40,7 @@ module Boards
       end
 
       def board_label_ids
-        @board_label_ids ||= board.lists.label.pluck(:label_id)
+        @board_label_ids ||= board.lists.movable.pluck(:label_id)
       end
 
       def without_board_labels(issues)
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb
index 6c6f60e1496..71f463bad30 100644
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
@@ -45,10 +45,10 @@ module Boards
 
       def remove_label_ids
         label_ids =
-          if moving_to_list.label?
+          if moving_to_list.movable?
             moving_from_list.label_id
           else
-            board.lists.label.pluck(:label_id)
+            board.lists.movable.pluck(:label_id)
           end
 
         Array(label_ids).compact