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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
6ed59e12
Commit
6ed59e12
authored
Apr 06, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide header counters for issue/mr/todos if zero
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
30c88499
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
15 deletions
+36
-15
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+7
-5
changelogs/unreleased/dz-hide-zero-counter.yml
changelogs/unreleased/dz-hide-zero-counter.yml
+4
-0
spec/features/dashboard/issuables_counter_spec.rb
spec/features/dashboard/issuables_counter_spec.rb
+25
-10
No files found.
app/views/layouts/header/_default.html.haml
View file @
6ed59e12
...
...
@@ -47,17 +47,19 @@
%li
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
aria:
{
label:
"Issues"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'hashtag fw'
)
%span
.badge.issues-count
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:issues
,
:opened
))
-
issues_count
=
cached_assigned_issuables_count
(
current_user
,
:issues
,
:opened
)
%span
.badge.issues-count
{
class:
(
'hidden'
if
issues_count
.
zero?
)
}
=
number_with_delimiter
(
issues_count
)
%li
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge requests'
,
aria:
{
label:
"Merge requests"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
custom_icon
(
'mr_bold'
)
%span
.badge.merge-requests-count
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:merge_requests
,
:opened
))
-
merge_requests_count
=
cached_assigned_issuables_count
(
current_user
,
:merge_requests
,
:opened
)
%span
.badge.merge-requests-count
{
class:
(
'hidden'
if
merge_requests_count
.
zero?
)
}
=
number_with_delimiter
(
merge_requests_count
)
%li
=
link_to
dashboard_todos_path
,
title:
'Todos'
,
aria:
{
label:
"Todos"
},
class:
'shortcuts-todos'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'check-circle fw'
)
%span
.badge.todos-count
%span
.badge.todos-count
{
class:
(
'hidden'
if
todos_pending_count
.
zero?
)
}
=
todos_count_format
(
todos_pending_count
)
%li
.header-user.dropdown
=
link_to
current_user
,
class:
"header-user-dropdown-toggle"
,
data:
{
toggle:
"dropdown"
}
do
...
...
changelogs/unreleased/dz-hide-zero-counter.yml
0 → 100644
View file @
6ed59e12
---
title
:
Hide header counters for issue/mr/todos if zero
merge_request
:
10506
author
:
spec/features/dashboard/issuables_counter_spec.rb
View file @
6ed59e12
require
'spec_helper'
describe
'Navigation bar counter'
,
feature:
true
,
js:
true
,
caching:
true
do
describe
'Navigation bar counter'
,
feature:
true
,
caching:
true
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
,
namespace:
user
.
namespace
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
...
...
@@ -13,33 +13,48 @@ describe 'Navigation bar counter', feature: true, js: true, caching: true do
end
it
'reflects dashboard issues count'
do
visit
issues_
dashboard_
path
visit
issues_path
expect_counters
(
'issues'
,
'1'
)
issue
.
update
(
assignee:
nil
)
visit
issues_dashboard_path
expect_counters
(
'issues'
,
'1'
)
Timecop
.
travel
(
3
.
minutes
.
from_now
)
do
visit
issues_path
expect_counters
(
'issues'
,
'0'
)
end
end
it
'reflects dashboard merge requests count'
do
visit
merge_requests_
dashboard_
path
visit
merge_requests_path
expect_counters
(
'merge_requests'
,
'1'
)
merge_request
.
update
(
assignee:
nil
)
visit
merge_requests_dashboard_path
expect_counters
(
'merge_requests'
,
'1'
)
Timecop
.
travel
(
3
.
minutes
.
from_now
)
do
visit
merge_requests_path
expect_counters
(
'merge_requests'
,
'0'
)
end
end
def
issues_path
issues_dashboard_path
(
assignee_id:
user
.
id
)
end
def
merge_requests_path
merge_requests_dashboard_path
(
assignee_id:
user
.
id
)
end
def
expect_counters
(
issuable_type
,
count
)
dashboard_count
=
find
(
'li.active'
)
find
(
'.global-dropdown-toggle'
).
click
dashboard_count
=
find
(
'.nav-links li.active'
)
nav_count
=
find
(
".dashboard-shortcuts-
#{
issuable_type
}
"
)
header_count
=
find
(
".header-content .
#{
issuable_type
.
tr
(
'_'
,
'-'
)
}
-count"
)
expect
(
nav_count
).
to
have_content
(
count
)
expect
(
dashboard_count
).
to
have_content
(
count
)
expect
(
nav_count
).
to
have_content
(
count
)
expect
(
header_count
).
to
have_content
(
count
)
end
end
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