Issue #13823: random message when all Todos are Done

3 files changed, 16 insertions, 1 deletions

diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index d425d0f9014..ca65f75daac 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -4,6 +4,10 @@ class Dashboard::TodosController < Dashboard::ApplicationController
   def index
     @sort = params[:sort]
     @todos = @todos.page(params[:page])
+
+    if @todos.empty? && current_user.todos.any?
+      @no_todos_message = Gitlab.config.gitlab.no_todos_messages.sample
+    end
   end
 
   def destroy
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 09c69786791..b7ca48ffa08 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -138,9 +138,20 @@ module TodosHelper
     end
   end
 
+  def no_todos_message
+    message, author = @no_todos_message.values_at('message', 'author')
+
+    if author
+      message +=  " -- " + author
+    end
+    
+   message
+  end
+
   private
 
   def show_todo_state?(todo)
     (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
   end
+
 end
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 5b2465e25ee..773645707d3 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -84,7 +84,7 @@
       = render "shared/empty_states/todos_all_done.svg"
       - if todos_filter_empty?
         %h4.text-center
-          Good job! Looks like you don't have any todos left.
+          = no_todos_message
         %p.text-center
           Are you looking for things to do? Take a look at
           = succeed "," do