Download as
Browse Code »

Commit 726cd88ce2a64d225f386d9cc6379c115237b3b7

Authored by Michel Felipe
Committed by Victor Costa
1 parent 78331cae
Exists in master and in 25 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Added field created_at above the task title on tasks list

Showing 3 changed files with 13 additions and 0 deletions   Show diff stats
app/views/tasks/_task.html.erb
  Diff comments   View file @726cd88
@@ -22,6 +22,8 @@ @@ -22,6 +22,8 @@
22 %> 22 %>
23 </div><!-- class="task_decisions" --> 23 </div><!-- class="task_decisions" -->
24 24
  25 + <div class="task_date"><%= show_time(task.created_at) %></div>
  26 +
25 <%= render :partial => 'task_title', :locals => {:task => task} %> 27 <%= render :partial => 'task_title', :locals => {:task => task} %>
26 28
27 <div class="task_information"> 29 <div class="task_information">
public/stylesheets/tasks.css
  Diff comments   View file @726cd88
@@ -17,6 +17,11 @@ @@ -17,6 +17,11 @@
17 font-size: 120%; 17 font-size: 120%;
18 } 18 }
19 19
  20 +.task_date {
  21 + color: gray;
  22 + font-size: 12px;
  23 +}
  24 +
20 .task_icon { 25 .task_icon {
21 float: left; 26 float: left;
22 margin-right: 10px; 27 margin-right: 10px;
test/functional/tasks_controller_test.rb
  Diff comments   View file @726cd88
@@ -49,6 +49,12 @@ class TasksControllerTest &lt; ActionController::TestCase @@ -49,6 +49,12 @@ class TasksControllerTest &lt; ActionController::TestCase
49 assert_kind_of Array, assigns(:tasks) 49 assert_kind_of Array, assigns(:tasks)
50 end 50 end
51 51
  52 + should 'display task created_at' do
  53 + Task.create!(:requestor => fast_create(Person), :target => profile, :spam => false)
  54 + get :index
  55 + assert_select '.task_date'
  56 + end
  57 +
52 should 'list processed tasks without spam' do 58 should 'list processed tasks without spam' do
53 requestor = fast_create(Person) 59 requestor = fast_create(Person)
54 task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true) 60 task_spam = create(Task, :status => Task::Status::FINISHED, :requestor => requestor, :target => profile, :spam => true)