diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-27 01:26:26 +0800 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-03-13 20:33:35 +0800 |
commit | 7d5ee4181a63318dd3a981fef9c12ce93e732fdb (patch) | |
tree | fb2c05c6beee188c1cf73112d7e4f502e3c87d98 /app/controllers/groups | |
parent | f06a649ced952bcc439a5b3d36d96df178aabd66 (diff) | |
download | gitlab-ce-7d5ee4181a63318dd3a981fef9c12ce93e732fdb.tar.gz |
Refactor groups and projects boards actions
Move common functionality to BoardsActions concern
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/boards_controller.rb | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb index 51fdb6c05fb..40b8d5ed72c 100644 --- a/app/controllers/groups/boards_controller.rb +++ b/app/controllers/groups/boards_controller.rb @@ -1,53 +1,16 @@ # frozen_string_literal: true class Groups::BoardsController < Groups::ApplicationController - include BoardsResponses + include BoardsActions include RecordUserLastActivity before_action :assign_endpoint_vars - before_action :boards, only: :index - before_action :redirect_to_recent_board, only: :index - - def index - respond_with_boards - end - - def show - @board = boards.find(params[:id]) - - # add/update the board in the recent visited table - Boards::Visits::CreateService.new(@board.group, current_user).execute(@board) if request.format.html? - - respond_with_board - end private - def boards - @boards ||= Boards::ListService.new(group, current_user).execute - end - def assign_endpoint_vars @boards_endpoint = group_boards_url(group) @namespace_path = group.to_param @labels_endpoint = group_labels_url(group) end - - def serialize_as_json(resource) - resource.as_json(only: [:id]) - end - - def includes_board?(board_id) - boards.any? { |board| board.id == board_id } - end - - def redirect_to_recent_board - return if request.format.json? - - recently_visited = Boards::Visits::LatestService.new(group, current_user).execute - - if recently_visited && includes_board?(recently_visited.board_id) - redirect_to(group_board_path(id: recently_visited.board_id), status: :found) - end - end end |