From 33be8181ac7a7885ccf5ea4850a87908d974ac28 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 28 Apr 2016 13:54:13 -0500
Subject: Add target status

---
 app/assets/stylesheets/pages/todos.scss   | 8 ++++++++
 app/helpers/todos_helper.rb               | 9 +++++++++
 app/views/dashboard/todos/_todo.html.haml | 4 ++++
 3 files changed, 21 insertions(+)

diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index e51c3491dae..7301d84ba21 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -29,6 +29,14 @@
 .todo-item {
   .todo-title {
     @include str-truncated(calc(100% - 174px));
+    overflow: visible;
+  }
+
+  .status-box {
+    margin: 0;
+    float: none;
+    display: inline-block;
+    font-weight: normal;
   }
 
   .todo-body {
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 81b9b5d7052..5d020e7f241 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -37,6 +37,15 @@ module TodosHelper
     end
   end
 
+  def todo_target_state_pill(todo)
+    klass = 'status-box '
+    klass << "status-box-#{todo.target.state.dasherize}"
+
+    content_tag(:span, nil, class: klass) {
+      todo.target.state.capitalize
+    }
+  end
+
   def todos_filter_params
     {
       state:      params[:state],
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 539f1dc6036..1f4a03cda2e 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -17,6 +17,10 @@
 
       &middot; #{time_ago_with_tooltip(todo.created_at)}
 
+      - if (todo.target.is_a?(MergeRequest) || todo.target.is_a?(Issue)) && ['closed', 'merged'].include?(todo.target.state)
+        %span.target-status
+          = todo_target_state_pill(todo)
+
     - if todo.pending?
       .todo-actions.pull-right
         = link_to [:dashboard, todo], method: :delete, class: 'btn btn-loading done-todo' do
-- 
cgit v1.2.1