diff options
author | Felipe Artur <felipefac@gmail.com> | 2017-08-29 00:56:49 +0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2017-08-29 00:56:49 +0300 |
commit | f2a43ff5b7eec188ffc470649bf40d268cbdce2a (patch) | |
tree | f9a59f5d83d883c482c9ebfe811580a0fc8f6be6 /app/controllers/projects/boards_controller.rb | |
parent | 5f88660a3f5d9f0de0109a3da46e81ea9024c677 (diff) |
Group boards CE backport
Diffstat (limited to 'app/controllers/projects/boards_controller.rb')
-rw-r--r-- | app/controllers/projects/boards_controller.rb | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb index 808affa4f98..88a57749d78 100644 --- a/app/controllers/projects/boards_controller.rb +++ b/app/controllers/projects/boards_controller.rb @@ -1,32 +1,31 @@ class Projects::BoardsController < Projects::ApplicationController include IssuableCollections + include BoardsResponses before_action :authorize_read_board!, only: [:index, :show] + before_action :assign_endpoint_vars def index - @boards = ::Boards::ListService.new(project, current_user).execute - - respond_to do |format| - format.html - format.json do - render json: serialize_as_json(@boards) - end - end + @boards = Boards::ListService.new(project, current_user).execute + + respond_with_boards end def show @board = project.boards.find(params[:id]) - respond_to do |format| - format.html - format.json do - render json: serialize_as_json(@board) - end - end + respond_with_board end private + def assign_endpoint_vars + @boards_endpoint = project_boards_url(project) + @bulk_issues_path = bulk_update_project_issues_path(project) + @namespace_path = project.namespace.path + @labels_endpoint = project_labels_path(project) + end + def authorize_read_board! return access_denied! unless can?(current_user, :read_board, project) end |