Group boards CE backport

2 files changed, 5 insertions, 6 deletions

diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb
index fe0d762ccd2..dbb6c0694b9 100644
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
@@ -3,17 +3,16 @@ module Boards
     class CreateService < BaseService
       def execute(board)
         List.transaction do
-          label    = available_labels.find(params[:label_id])
+          label    = available_labels_for(board).find(params[:label_id])
           position = next_position(board)
-
           create_list(board, label, position)
         end
       end
 
       private
 
-      def available_labels
-        LabelsFinder.new(current_user, project_id: project.id).execute
+      def available_labels_for(board)
+        LabelsFinder.new(current_user, project_id: parent.id).execute
       end
 
       def next_position(board)
diff --git a/app/services/boards/lists/generate_service.rb b/app/services/boards/lists/generate_service.rb
index 939f9bfd068..3bf37649787 100644
--- a/app/services/boards/lists/generate_service.rb
+++ b/app/services/boards/lists/generate_service.rb
@@ -15,11 +15,11 @@ module Boards
 
       def create_list(board, params)
         label = find_or_create_label(params)
-        Lists::CreateService.new(project, current_user, label_id: label.id).execute(board)
+        Lists::CreateService.new(parent, current_user, label_id: label.id).execute(board)
       end
 
       def find_or_create_label(params)
-        ::Labels::FindOrCreateService.new(current_user, project, params).execute
+        ::Labels::FindOrCreateService.new(current_user, parent, params).execute
       end
 
       def label_params