Commit 97067682 authored by Felipe Artur's avatar Felipe Artur

CE backport - Allow viewing only one board when multiple issue boards is not enabled

parent f8568baa
...@@ -2,19 +2,24 @@ class Groups::BoardsController < Groups::ApplicationController ...@@ -2,19 +2,24 @@ class Groups::BoardsController < Groups::ApplicationController
include BoardsResponses include BoardsResponses
before_action :assign_endpoint_vars before_action :assign_endpoint_vars
before_action :boards, only: :index
def index def index
@boards = Boards::ListService.new(group, current_user).execute
respond_with_boards respond_with_boards
end end
def show def show
@board = group.boards.find(params[:id]) @board = boards.find(params[:id])
respond_with_board respond_with_board
end end
private
def boards
@boards ||= Boards::ListService.new(group, current_user).execute
end
def assign_endpoint_vars def assign_endpoint_vars
@boards_endpoint = group_boards_url(group) @boards_endpoint = group_boards_url(group)
@namespace_path = group.to_param @namespace_path = group.to_param
......
...@@ -4,22 +4,25 @@ class Projects::BoardsController < Projects::ApplicationController ...@@ -4,22 +4,25 @@ class Projects::BoardsController < Projects::ApplicationController
before_action :check_issues_available! before_action :check_issues_available!
before_action :authorize_read_board!, only: [:index, :show] before_action :authorize_read_board!, only: [:index, :show]
before_action :boards, only: :index
before_action :assign_endpoint_vars before_action :assign_endpoint_vars
def index def index
@boards = Boards::ListService.new(project, current_user).execute
respond_with_boards respond_with_boards
end end
def show def show
@board = project.boards.find(params[:id]) @board = boards.find(params[:id])
respond_with_board respond_with_board
end end
private private
def boards
@boards ||= Boards::ListService.new(project, current_user).execute
end
def assign_endpoint_vars def assign_endpoint_vars
@boards_endpoint = project_boards_path(project) @boards_endpoint = project_boards_path(project)
@bulk_issues_path = bulk_update_project_issues_path(project) @bulk_issues_path = bulk_update_project_issues_path(project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment