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
c9e87b80
Commit
c9e87b80
authored
Sep 17, 2019
by
Brian Kabiro
Committed by
Clement Ho
Sep 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add check for hiding boards-switcher
parent
24ed1470
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
15 deletions
+20
-15
app/helpers/boards_helper.rb
app/helpers/boards_helper.rb
+1
-1
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+1
-1
ee/changelogs/unreleased/12775-hide-issue-boards-switcher.yml
...hangelogs/unreleased/12775-hide-issue-boards-switcher.yml
+5
-0
ee/spec/features/boards/group_boards/multiple_boards_spec.rb
ee/spec/features/boards/group_boards/multiple_boards_spec.rb
+7
-12
ee/spec/features/labels_hierarchy_spec.rb
ee/spec/features/labels_hierarchy_spec.rb
+2
-1
spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
..._examples/boards/multiple_issue_boards_shared_examples.rb
+4
-0
No files found.
app/helpers/boards_helper.rb
View file @
c9e87b80
...
@@ -88,7 +88,7 @@ module BoardsHelper
...
@@ -88,7 +88,7 @@ module BoardsHelper
end
end
def
boards_link_text
def
boards_link_text
if
current_board_parent
.
multiple_issu
e_boards_available?
if
multipl
e_boards_available?
s_
(
"IssueBoards|Boards"
)
s_
(
"IssueBoards|Boards"
)
else
else
s_
(
"IssueBoards|Board"
)
s_
(
"IssueBoards|Board"
)
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
c9e87b80
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.issues-filters
{
class:
(
"w-100"
if
type
==
:boards_modal
)
}
.issues-filters
{
class:
(
"w-100"
if
type
==
:boards_modal
)
}
.issues-details-filters.filtered-search-block.d-flex.flex-column.flex-md-row
{
class:
block_css_class
,
"v-pre"
=>
type
==
:boards_modal
}
.issues-details-filters.filtered-search-block.d-flex.flex-column.flex-md-row
{
class:
block_css_class
,
"v-pre"
=>
type
==
:boards_modal
}
-
if
type
==
:boards
-
if
type
==
:boards
&&
(
multiple_boards_available?
||
current_board_parent
.
boards
.
size
>
1
)
=
render
"shared/boards/switcher"
,
board:
board
=
render
"shared/boards/switcher"
,
board:
board
=
form_tag
page_filter_path
,
method: :get
,
class:
'filter-form js-filter-form w-100'
do
=
form_tag
page_filter_path
,
method: :get
,
class:
'filter-form js-filter-form w-100'
do
-
if
params
[
:search
].
present?
-
if
params
[
:search
].
present?
...
...
ee/changelogs/unreleased/12775-hide-issue-boards-switcher.yml
0 → 100644
View file @
c9e87b80
---
title
:
Hide boards-switcher on group boards
merge_request
:
15293
author
:
briankabiro
type
:
changed
ee/spec/features/boards/group_boards/multiple_boards_spec.rb
View file @
c9e87b80
...
@@ -19,28 +19,23 @@ describe 'Multiple Issue Boards', :js do
...
@@ -19,28 +19,23 @@ describe 'Multiple Issue Boards', :js do
login_as
(
user
)
login_as
(
user
)
end
end
it
'
hides the link to create a new board
'
do
it
'
does not show board switcher
'
do
visit
boards_path
visit
boards_path
wait_for_requests
wait_for_requests
click_button
board
.
name
expect
(
page
).
not_to
have_css
(
'.boards-switcher'
)
page
.
within
(
'.js-boards-selector .dropdown-menu'
)
do
expect
(
page
).
not_to
have_content
(
'Create new board'
)
expect
(
page
).
not_to
have_content
(
'Delete board'
)
end
end
end
it
'does not show license warning when there is one board created'
do
it
'shows the board switcher when group has more than one board'
do
create
(
:board
,
parent:
parent
)
visit
boards_path
visit
boards_path
wait_for_requests
wait_for_requests
click_button
board
.
name
expect
(
page
).
to
have_css
(
'.boards-switcher'
)
expect
(
page
).
not_to
have_content
(
'Some of your boards are hidden, activate a license to see them again.'
)
end
end
it
'shows
a
license warning when group has more than one board'
do
it
'shows license warning when group has more than one board'
do
create
(
:board
,
parent:
parent
)
create
(
:board
,
parent:
parent
)
visit
boards_path
visit
boards_path
...
...
ee/spec/features/labels_hierarchy_spec.rb
View file @
c9e87b80
...
@@ -56,7 +56,8 @@ describe 'Labels Hierarchy', :js do
...
@@ -56,7 +56,8 @@ describe 'Labels Hierarchy', :js do
context
'scoped boards'
do
context
'scoped boards'
do
context
'for group boards'
do
context
'for group boards'
do
let
(
:board
)
{
create
(
:board
,
group:
parent
)
}
let!
(
:board
)
{
create
(
:board
,
group:
parent
)
}
let!
(
:board_2
)
{
create
(
:board
,
group:
parent
)
}
before
do
before
do
visit
group_board_path
(
parent
,
board
)
visit
group_board_path
(
parent
,
board
)
...
...
spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
View file @
c9e87b80
...
@@ -11,6 +11,10 @@ shared_examples_for 'multiple issue boards' do
...
@@ -11,6 +11,10 @@ shared_examples_for 'multiple issue boards' do
wait_for_requests
wait_for_requests
end
end
it
'shows board switcher'
do
expect
(
page
).
to
have_css
(
'.boards-switcher'
)
end
it
'shows current board name'
do
it
'shows current board name'
do
page
.
within
(
'.boards-switcher'
)
do
page
.
within
(
'.boards-switcher'
)
do
expect
(
page
).
to
have_content
(
board
.
name
)
expect
(
page
).
to
have_content
(
board
.
name
)
...
...
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