Download as
Browse Code »

Commit d484e7ea281bd8c3a87214e050747351e405e8ca

Authored by Michel Felipe
1 parent d1f57f9c
Exists in master and in 7 other branches avoid_duplicated_tasks, proposal_response, proposal_task_category_required, remove_escaped_html, restore_rejected_proposal, staging, tasks_keep_filter_params

Fix error to check if moderator evaluated_by exists

Showing 2 changed files with 19 additions and 11 deletions   Show diff stats
views/proposals_discussion_plugin_tasks/_task.html.erb
  Diff comments   View file @d484e7e
@@ -46,16 +46,21 @@ @@ -46,16 +46,21 @@
46 </div> 46 </div>
47 47
48 <% unless @view_only #MODERATOR VIEW %> 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 + <% if task.proposal_evaluation.present? %>
  50 + <div class="moderator">
  51 + <b><%= _('Moderator') %>:</b>
  52 + <% if task.proposal_evaluation.evaluated_by.present? %>
  53 + <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span>
  54 + <% end %>
  55 + &nbsp; &#151; &nbsp;
  56 + <span class="processed">
  57 + <b><%= _('Moderated at') %>:</b>
  58 + <span class="value"><%= show_time(task.proposal_evaluation.created_at) %></span>
  59 + </span>
  60 + </div>
  61 + <% end %>
  62 +
  63 + <% end %>
59 64
60 65
61 <%= fields_for "tasks[#{task.id}][task]", task do |f| %> 66 <%= fields_for "tasks[#{task.id}][task]", task do |f| %>
views/tasks/proposals_discussion_plugin/_proposal_task_processed.html.erb
  Diff comments   View file @d484e7e
@@ -16,7 +16,10 @@ @@ -16,7 +16,10 @@
16 <% if task.proposal_evaluation.present? %> 16 <% if task.proposal_evaluation.present? %>
17 <div class="closed-by"> 17 <div class="closed-by">
18 <span class="label"><%= _('Moderator') %>:</span> 18 <span class="label"><%= _('Moderator') %>:</span>
19 - <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span> 19 +
  20 + <% if task.proposal_evaluation.evaluated_by.present? %>
  21 + <span class="value"><%= link_to(task.proposal_evaluation.evaluated_by.name, task.proposal_evaluation.evaluated_by.url) %></span>
  22 + <% end %>
20 &nbsp; &#151; &nbsp; 23 &nbsp; &#151; &nbsp;
21 <span class="processed"> 24 <span class="processed">
22 <span class="label"><%= _('Moderated at') %>:</span> 25 <span class="label"><%= _('Moderated at') %>:</span>