From 726cd88ce2a64d225f386d9cc6379c115237b3b7 Mon Sep 17 00:00:00 2001 From: Michel Felipe Date: Thu, 28 May 2015 10:21:19 -0300 Subject: [PATCH] Added field created_at above the task title on tasks list --- app/views/tasks/_task.html.erb | 2 ++ public/stylesheets/tasks.css | 5 +++++ test/functional/tasks_controller_test.rb | 6 ++++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb index babec6f..aad9f76 100644 --- a/app/views/tasks/_task.html.erb +++ b/app/views/tasks/_task.html.erb @@ -22,6 +22,8 @@ %> +
<%= show_time(task.created_at) %>
+ <%= render :partial => 'task_title', :locals => {:task => task} %>
diff --git a/public/stylesheets/tasks.css b/public/stylesheets/tasks.css index 425117a..39193a9 100644 --- a/public/stylesheets/tasks.css +++ b/public/stylesheets/tasks.css @@ -17,6 +17,11 @@ font-size: 120%; } +.task_date { + color: gray; + font-size: 12px; +} + .task_icon { float: left; margin-right: 10px; diff --git a/test/functional/tasks_controller_test.rb b/test/functional/tasks_controller_test.rb index 458ff86..74cb51a 100644 --- a/test/functional/tasks_controller_test.rb +++ b/test/functional/tasks_controller_test.rb @@ -49,6 +49,12 @@ class TasksControllerTest < ActionController::TestCase assert_kind_of Array, assigns(:tasks) end + should 'display task created_at' do + Task.create!(:requestor => fast_create(Person), :target => profile, :spam => false) + get :index + assert_select '.task_date' + end + should 'list processed tasks without spam' do requestor = fast_create(Person) task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true) -- libgit2 0.21.2