Commit aa997e42 authored by Felipe Artur's avatar Felipe Artur

Small fixes

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