Fixed todos empty state when filtering

Closes #24127
This commit is contained in:
Phil Hughes 2016-11-07 16:12:05 +00:00
parent 717b8a7692
commit 0bc9008ef6
2 changed files with 16 additions and 8 deletions

View File

@ -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)

View File

@ -83,14 +83,18 @@
.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
Good job! Looks like you don't have any todos left. - if todos_filter_empty?
%p.text-center Good job! Looks like you don't have any todos left.
Are you looking for things to do? Take a look at - else
= succeed "," do There are no Todos to show.
= link_to "the opened issues", issues_dashboard_path - if todos_filter_empty?
contribute to %p.text-center
= link_to "merge requests", merge_requests_dashboard_path Are you looking for things to do? Take a look at
or mention someone in a comment to assign a new todo automatically. = 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 - else
.todos-empty .todos-empty
.todos-empty-hero .todos-empty-hero