Commit dc1b66cf authored by Felipe Artur's avatar Felipe Artur

Fix route conflict

parent e2672c68
...@@ -41,8 +41,8 @@ module BoardsHelper ...@@ -41,8 +41,8 @@ module BoardsHelper
current_board_parent.multiple_issue_boards_available?(current_user) current_board_parent.multiple_issue_boards_available?(current_user)
end end
def board_path(board) def current_board_path(board)
@board_path ||= project_board_path(current_board_parent, board) @current_board_path ||= project_board_path(current_board_parent, board)
end end
def current_board_parent def current_board_parent
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
%p %p
Are you sure you want to delete this board? Are you sure you want to delete this board?
.board-delete-btns.clearfix .board-delete-btns.clearfix
= link_to board_path(board), = link_to current_board_path(board),
class: "btn btn-danger pull-left", class: "btn btn-danger pull-left",
method: :delete do method: :delete do
Delete Delete
......
class Groups::BoardsController < Groups::ApplicationController class Groups::BoardsController < Groups::ApplicationController
prepend ::EE::Boards::BoardsController prepend EE::Boards::BoardsController
prepend ::EE::BoardsResponses prepend EE::BoardsResponses
include BoardsResponses include BoardsResponses
before_action :check_group_issue_boards_available! before_action :check_group_issue_boards_available!
......
...@@ -25,8 +25,8 @@ module EE ...@@ -25,8 +25,8 @@ module EE
end end
end end
def board_path(board) def current_board_path(board)
@board_path ||= begin @current_board_path ||= begin
if board.group_board? if board.group_board?
group_board_path(current_board_parent, board) group_board_path(current_board_parent, board)
else else
......
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