Download as
Browse Code »

Commit 7a0ee96dd09fe1fbb8d09bc4282065d59c3c45f5

Authored by Michel Felipe
1 parent 3b0b05ce
Exists in master and in 8 other branches avoid_duplicated_tasks, proposal_response, proposal_task_category, proposal_task_category_required, remove_escaped_html, restore_rejected_proposal, staging, tasks_keep_filter_params

Added moderated name and datetime in tasks validator view

Showing 2 changed files with 17 additions and 2 deletions   Show diff stats
public/style.css
  Diff comments   View file @7a0ee96
@@ -397,3 +397,8 @@ div.confirm_evaluation_button a.disabled { @@ -397,3 +397,8 @@ div.confirm_evaluation_button a.disabled {
397 text-align: center; 397 text-align: center;
398 color: #000 !important; 398 color: #000 !important;
399 } 399 }
  400 +
  401 +.moderator {
  402 + margin-top: 15px;
  403 + margin-left: 10px;
  404 +}
views/proposals_discussion_plugin_tasks/_task.html.erb
  Diff comments   View file @7a0ee96
1 <div class="task_box" id="task-<%= task.id %>"> 1 <div class="task_box" id="task-<%= task.id %>">
2 - 2 +
3 <div class="task-proposal-source"><b><%= _('Source') %>:</b> <%= task.proposal_source %></div> 3 <div class="task-proposal-source"><b><%= _('Source') %>:</b> <%= task.proposal_source %></div>
4 <%= tag :a, name: "task-#{task.id}" %> 4 <%= tag :a, name: "task-#{task.id}" %>
5 <%= render :partial => 'task_icon', :locals => {:task => task} %> 5 <%= render :partial => 'task_icon', :locals => {:task => task} %>
@@ -45,7 +45,17 @@ @@ -45,7 +45,17 @@
45 </div> 45 </div>
46 </div> 46 </div>
47 47
48 - 48 + <% unless @view_only #MODERATOR VIEW %>
  49 + <div class="moderator">
  50 + <b><%= _('Moderator') %>:</b>
  51 + <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span>
  52 + &nbsp; &#151; &nbsp;
  53 + <span class="processed">
  54 + <b><%= _('Moderated at') %>:</b>
  55 + <span class="value"><%= show_time(task.proposal_evaluation.created_at) %></span>
  56 + </span>
  57 + </div>
  58 + <% end %>
49 59
50 60
51 <%= fields_for "tasks[#{task.id}][task]", task do |f| %> 61 <%= fields_for "tasks[#{task.id}][task]", task do |f| %>