Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
dc1b66cf
Commit
dc1b66cf
authored
Sep 04, 2017
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix route conflict
parent
e2672c68
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
app/helpers/boards_helper.rb
app/helpers/boards_helper.rb
+2
-2
app/views/shared/boards/_switcher.html.haml
app/views/shared/boards/_switcher.html.haml
+1
-1
ee/app/controllers/groups/boards_controller.rb
ee/app/controllers/groups/boards_controller.rb
+2
-2
ee/app/helpers/ee/boards_helper.rb
ee/app/helpers/ee/boards_helper.rb
+2
-2
No files found.
app/helpers/boards_helper.rb
View file @
dc1b66cf
...
@@ -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
...
...
app/views/shared/boards/_switcher.html.haml
View file @
dc1b66cf
...
@@ -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
...
...
ee/app/controllers/groups/boards_controller.rb
View file @
dc1b66cf
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!
...
...
ee/app/helpers/ee/boards_helper.rb
View file @
dc1b66cf
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment