diff options
| -rw-r--r-- | app/controllers/projects/boards/lists_controller.rb | 4 | ||||
| -rw-r--r-- | app/services/boards/lists/list_service.rb | 2 | ||||
| -rw-r--r-- | spec/services/boards/issues/list_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/boards/lists/list_service_spec.rb | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/projects/boards/lists_controller.rb b/app/controllers/projects/boards/lists_controller.rb index fbfabd86575..ad53bb749a0 100644 --- a/app/controllers/projects/boards/lists_controller.rb +++ b/app/controllers/projects/boards/lists_controller.rb @@ -5,9 +5,9 @@ module Projects before_action :authorize_read_list!, only: [:index] def index - board.lists.create(list_type: :backlog) unless board.lists.backlog.any? + lists = ::Boards::Lists::ListService.new(project, current_user).execute(board) - render json: serialize_as_json(board.lists) + render json: serialize_as_json(lists) end def create diff --git a/app/services/boards/lists/list_service.rb b/app/services/boards/lists/list_service.rb index c579ed4c869..4ec56c3ac4d 100644 --- a/app/services/boards/lists/list_service.rb +++ b/app/services/boards/lists/list_service.rb @@ -2,6 +2,8 @@ module Boards module Lists class ListService < BaseService def execute(board) + board.lists.create(list_type: :backlog) unless board.lists.backlog.any? + board.lists end end diff --git a/spec/services/boards/issues/list_service_spec.rb b/spec/services/boards/issues/list_service_spec.rb index a66cc2cd6e9..a1e220c2322 100644 --- a/spec/services/boards/issues/list_service_spec.rb +++ b/spec/services/boards/issues/list_service_spec.rb @@ -67,7 +67,7 @@ describe Boards::Issues::ListService, services: true do issues = described_class.new(project, user, params).execute - expect(issues).to eq [closed_issue4, closed_issue2, closed_issue5, closed_issue3, closed_issue1] + expect(issues).to eq [closed_issue4, closed_issue2, closed_issue3, closed_issue1] end it 'returns opened issues that have label list applied when listing issues from a label list' do diff --git a/spec/services/boards/lists/list_service_spec.rb b/spec/services/boards/lists/list_service_spec.rb index ab9fb1bc914..97063381196 100644 --- a/spec/services/boards/lists/list_service_spec.rb +++ b/spec/services/boards/lists/list_service_spec.rb @@ -10,7 +10,7 @@ describe Boards::Lists::ListService, services: true do service = described_class.new(project, double) - expect(service.execute(board)).to eq [list, board.closed_list] + expect(service.execute(board)).to eq [board.backlog_list, list, board.closed_list] end end end |