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
0bc9008e
Commit
0bc9008e
authored
Nov 07, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed todos empty state when filtering
Closes #24127
parent
717b8a76
Changes
2
Show 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
...
@@ -61,6 +61,10 @@ module TodosHelper
}
}
end
end
def
todos_filter_empty?
todos_filter_params
.
all?
{
|
key
,
value
|
value
.
nil?
}
end
def
todos_filter_path
(
options
=
{})
def
todos_filter_path
(
options
=
{})
without
=
options
.
delete
(
:without
)
without
=
options
.
delete
(
:without
)
...
...
app/views/dashboard/todos/index.html.haml
View file @
0bc9008e
...
@@ -83,7 +83,11 @@
...
@@ -83,7 +83,11 @@
.todos-all-done
.todos-all-done
=
render
"shared/empty_states/todos_all_done.svg"
=
render
"shared/empty_states/todos_all_done.svg"
%h4
.text-center
%h4
.text-center
-
if
todos_filter_empty?
Good job! Looks like you don't have any todos left.
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
%p
.text-center
Are you looking for things to do? Take a look at
Are you looking for things to do? Take a look at
=
succeed
","
do
=
succeed
","
do
...
...
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