diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-03 09:58:55 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-03 09:58:55 +0100 |
commit | 8ea18c37611ccb86b286761cc373c01199d64878 (patch) | |
tree | 96939c1c29f6269b585e446a4803db0333c8a756 /app | |
parent | a3abfb9708d894b434484fa0e2a836bb0ebd2cdb (diff) | |
download | gitlab-ce-8ea18c37611ccb86b286761cc373c01199d64878.tar.gz |
Moved todo due date to helper method
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/todos_helper.rb | 7 | ||||
-rw-r--r-- | app/views/dashboard/todos/_todo.html.haml | 8 |
2 files changed, 7 insertions, 8 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 diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml index 45d50f323e1..cc77388563f 100644 --- a/app/views/dashboard/todos/_todo.html.haml +++ b/app/views/dashboard/todos/_todo.html.haml @@ -19,13 +19,7 @@ (removed) · #{time_ago_with_tooltip(todo.created_at)} - - - if todo.target.try(:due_date) - - is_due_today = todo.target.due_date.try(:today?) - - is_overdue = todo.target.try(:overdue?) - · - %span{ class: [('text-warning' if is_due_today), ('text-danger' if is_overdue)] } - = todo_due_date(todo) + · #{todo_due_date(todo)} .todo-body .todo-note |