1
Download as
Browse Code »

Commit 1cf1f45bbfc9348987c48ea37414c7f1268067d7

Authored by Victor Costa
1 parent 4a932d4a
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Accept specific view for tasks

Showing 3 changed files with 27 additions and 24 deletions   Show diff stats
app/views/tasks/_task_processed.html.erb 0 → 100644
  Diff comments   View file @1cf1f45
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
  1 +<div class="title">
  2 + <%= task_information(task) %>
  3 +</div>
  4 +<div class="status">
  5 + <%= _(Task::Status.names[task.status]) %>
  6 +</div>
  7 +<div class="dates">
  8 + <span class="created">
  9 + <span class="label"><%= _('Created:') %></span>
  10 + <span class="value"><%= show_date(task.created_at) %></span>
  11 + </span>
  12 + &nbsp; &#151; &nbsp;
  13 + <span class="processed">
  14 + <span class="label"><%= _('Processed:') %></span>
  15 + <span class="value"><%= show_date(task.end_date) %></span>
  16 + </span>
  17 +</div>
  18 +<% if task.closed_by.present? %>
  19 + <div class="closed-by">
  20 + <span class="label"><%= _('Closed by:') %></span>
  21 + <span class="value"><%= link_to(task.closed_by.name, task.closed_by.url) %></span>
  22 + </div>
  23 +<% end %>
app/views/tasks/index.html.erb
  Diff comments   View file @1cf1f45
@@ -62,7 +62,9 @@ @@ -62,7 +62,9 @@
62 <% end %> 62 <% end %>
63 63
64 <div class="task_boxes"> 64 <div class="task_boxes">
65 - <%= render :partial => 'task', :collection => @tasks %> 65 + <% @tasks.each do |task| %>
  66 + <%= render :partial => partial_for_class(task.class, nil, nil), :locals => {:task => task} %>
  67 + <% end %>
66 </div> 68 </div>
67 69
68 <% unless @view_only %> 70 <% unless @view_only %>
app/views/tasks/processed.html.erb
  Diff comments   View file @1cf1f45
@@ -40,29 +40,7 @@ @@ -40,29 +40,7 @@
40 <ul class="task-list"> 40 <ul class="task-list">
41 <% @tasks.each do |item| %> 41 <% @tasks.each do |item| %>
42 <li class="task status-<%= item.status%>"> 42 <li class="task status-<%= item.status%>">
43 - <div class="title">  
44 - <%= task_information(item) %>  
45 - </div>  
46 - <div class="status">  
47 - <%= _(Task::Status.names[item.status]) %>  
48 - </div>  
49 - <div class="dates">  
50 - <span class="created">  
51 - <span class="label"><%= _('Created:') %></span>  
52 - <span class="value"><%= show_date(item.created_at) %></span>  
53 - </span>  
54 - &nbsp; &#151; &nbsp;  
55 - <span class="processed">  
56 - <span class="label"><%= _('Processed:') %></span>  
57 - <span class="value"><%= show_date(item.end_date) %></span>  
58 - </span>  
59 - </div>  
60 - <% if item.closed_by.present? %>  
61 - <div class="closed-by">  
62 - <span class="label"><%= _('Closed by:') %></span>  
63 - <span class="value"><%= link_to(item.closed_by.name, item.closed_by.url) %></span>  
64 - </div>  
65 - <% end %> 43 + <%= render :partial => partial_for_class(item.class, nil, 'processed'), :locals => {:task => item} %>
66 </li> 44 </li>
67 <% end %> 45 <% end %>
68 </ul> 46 </ul>