Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
0bc9008e
Commit
0bc9008e
authored
8 years ago
by
Phil Hughes
Browse files
Options
Download
Email Patches
Plain Diff
Fixed todos empty state when filtering
Closes #24127
parent
717b8a76
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+4
-0
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+12
-8
No files found.
app/helpers/todos_helper.rb
View file @
0bc9008e
...
...
@@ -61,6 +61,10 @@ module TodosHelper
}
end
def
todos_filter_empty?
todos_filter_params
.
all?
{
|
key
,
value
|
value
.
nil?
}
end
def
todos_filter_path
(
options
=
{})
without
=
options
.
delete
(
:without
)
...
...
This diff is collapsed.
Click to expand it.
app/views/dashboard/todos/index.html.haml
View file @
0bc9008e
...
...
@@ -83,14 +83,18 @@
.todos-all-done
=
render
"shared/empty_states/todos_all_done.svg"
%h4
.text-center
Good job! Looks like you don't have any todos left.
%p
.text-center
Are you looking for things to do? Take a look at
=
succeed
","
do
=
link_to
"the opened issues"
,
issues_dashboard_path
contribute to
=
link_to
"merge requests"
,
merge_requests_dashboard_path
or mention someone in a comment to assign a new todo automatically.
-
if
todos_filter_empty?
Good job! Looks like you don't have any todos left.
-
else
There are no Todos to show.
-
if
todos_filter_empty?
%p
.text-center
Are you looking for things to do? Take a look at
=
succeed
","
do
=
link_to
"the opened issues"
,
issues_dashboard_path
contribute to
=
link_to
"merge requests"
,
merge_requests_dashboard_path
or mention someone in a comment to assign a new todo automatically.
-
else
.todos-empty
.todos-empty-hero
...
...
This diff is collapsed.
Click to expand it.
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