Merge branch 'todos-filter-empty-state' into 'master'
Fixed todos empty state when filtering Closes #24127 See merge request !7334
This commit is contained in:
commit
8f85bd5789
|
@ -61,6 +61,10 @@ module TodosHelper
|
|||
}
|
||||
end
|
||||
|
||||
def todos_filter_empty?
|
||||
todos_filter_params.values.none?
|
||||
end
|
||||
|
||||
def todos_filter_path(options = {})
|
||||
without = options.delete(:without)
|
||||
|
||||
|
|
|
@ -82,15 +82,19 @@
|
|||
- elsif current_user.todos.any?
|
||||
.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?
|
||||
%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.
|
||||
- else
|
||||
%h4.text-center
|
||||
There are no todos to show.
|
||||
- else
|
||||
.todos-empty
|
||||
.todos-empty-hero
|
||||
|
|
Loading…
Reference in New Issue