Small fixes
This commit is contained in:
parent
02fed9a905
commit
aa997e4297
|
@ -10,7 +10,7 @@ module Boards
|
|||
def index
|
||||
issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute
|
||||
issues = issues.page(params[:page]).per(params[:per] || 20)
|
||||
make_sure_position_is_set(issues) unless Gitlab::Geo.secondary?
|
||||
make_sure_position_is_set(issues)
|
||||
|
||||
render json: {
|
||||
issues: serialize_as_json(issues.preload(:project)),
|
||||
|
|
|
@ -8,7 +8,6 @@ module BoardsHelper
|
|||
boards_endpoint: @boards_endpoint,
|
||||
lists_endpoint: board_lists_url(board),
|
||||
board_id: board.id,
|
||||
board_milestone_title: board&.milestone&.title,
|
||||
disabled: "#{!can?(current_user, :admin_list, current_board_parent)}",
|
||||
issue_link_base: build_issue_link_base,
|
||||
root_path: root_path,
|
||||
|
|
|
@ -9,6 +9,14 @@ class Board < ActiveRecord::Base
|
|||
true
|
||||
end
|
||||
|
||||
def parent
|
||||
project
|
||||
end
|
||||
|
||||
def group_board?
|
||||
false
|
||||
end
|
||||
|
||||
def backlog_list
|
||||
lists.merge(List.backlog).take
|
||||
end
|
||||
|
|
|
@ -40,7 +40,7 @@ module Boards
|
|||
end
|
||||
|
||||
def set_parent
|
||||
params[:project_id] = project.id
|
||||
params[:project_id] = parent.id
|
||||
end
|
||||
|
||||
def set_state
|
||||
|
|
|
@ -54,7 +54,7 @@ module Issues
|
|||
end
|
||||
end
|
||||
|
||||
def handle_move_between_iids(issue)
|
||||
def handle_move_between_ids(issue)
|
||||
return unless params[:move_between_ids]
|
||||
|
||||
after_id, before_id = params.delete(:move_between_ids)
|
||||
|
|
Loading…
Reference in New Issue