Moved todo due date to helper method

1 files changed, 6 insertions, 1 deletions

diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 26d61c32744..9542d3d7941 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -115,9 +115,14 @@ module TodosHelper
   end
 
   def todo_due_date(todo)
+    return unless todo.target.try(:due_date)
+
     is_due_today = todo.target.due_date.try(:today?)
+    is_overdue = todo.target.try(:overdue?)
 
-    "Due #{is_due_today ? "today" : todo.target.due_date.to_s(:medium)}"
+    content_tag :span, class: [('text-warning' if is_due_today), ('text-danger' if is_overdue)] do
+      "Due #{is_due_today ? "today" : todo.target.due_date.to_s(:medium)}"
+    end
   end
 
   private