Download as
Browse Code »

Commit 0a8229946d0cc4a5bb5184d151239f343a6de0d2

Authored by Michel Felipe
1 parent 65960e95
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 the moderated and validated dates into processed view

Showing 4 changed files with 44 additions and 3 deletions   Show diff stats
lib/proposals_discussion_plugin/proposal_task.rb
  Diff comments   View file @0a82299
@@ -6,6 +6,8 @@ class ProposalsDiscussionPlugin::ProposalTask < Task @@ -6,6 +6,8 @@ class ProposalsDiscussionPlugin::ProposalTask < Task
6 foreign_key: :task_id, 6 foreign_key: :task_id,
7 association_foreign_key: :category_id 7 association_foreign_key: :category_id
8 8
  9 + has_one :proposal_evaluation
  10 +
9 validates_presence_of :requestor_id, :target_id 11 validates_presence_of :requestor_id, :target_id
10 validates_associated :article_object 12 validates_associated :article_object
11 13
@@ -150,6 +152,8 @@ class ProposalsDiscussionPlugin::ProposalTask < Task @@ -150,6 +152,8 @@ class ProposalsDiscussionPlugin::ProposalTask < Task
150 152
151 def perform 153 def perform
152 article_object.save! 154 article_object.save!
  155 + self.data[:article][:id] = article_object[:id]
  156 + self.save!
153 end 157 end
154 158
155 def title 159 def title
po/proposals_discussion.pot
  Diff comments   View file @0a82299
@@ -413,3 +413,19 @@ msgstr "" @@ -413,3 +413,19 @@ msgstr ""
413 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3 413 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3
414 msgid "Source" 414 msgid "Source"
415 msgstr "" 415 msgstr ""
  416 +
  417 +#: plugins/proposals_discussion/views/tasks/processed.html.erb:67
  418 +msgid "Evaluator"
  419 +msgstr ""
  420 +
  421 +#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
  422 +msgid "Evaluator at"
  423 +msgstr "Validado em"
  424 +
  425 +#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
  426 +msgid "Moderator"
  427 +msgstr "Validador"
  428 +
  429 +#: plugins/proposals_discussion/views/tasks/processed.html.erb:61
  430 +msgid "Moderator at"
  431 +msgstr "Moderado em"
po/pt/proposals_discussion.po
  Diff comments   View file @0a82299
@@ -438,3 +438,15 @@ msgstr "Atribuído para:" @@ -438,3 +438,15 @@ msgstr "Atribuído para:"
438 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3 438 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3
439 msgid "Source" 439 msgid "Source"
440 msgstr "Origem" 440 msgstr "Origem"
  441 +
  442 +#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
  443 +msgid "Evaluator"
  444 +msgstr "Validador"
  445 +
  446 +#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
  447 +msgid "Moderator"
  448 +msgstr "Validador"
  449 +
  450 +#: plugins/proposals_discussion/views/tasks/processed.html.erb:61
  451 +msgid "Moderator at"
  452 +msgstr "Moderado em"
views/tasks/processed.html.erb
  Diff comments   View file @0a82299
@@ -52,16 +52,25 @@ @@ -52,16 +52,25 @@
52 <span class="label"><%= _('Created:') %></span> 52 <span class="label"><%= _('Created:') %></span>
53 <span class="value"><%= show_date(item.created_at) %></span> 53 <span class="value"><%= show_date(item.created_at) %></span>
54 </span> 54 </span>
  55 + </div>
  56 + <div class="closed-by">
  57 + <span class="label"><%= _('Moderator') %>:</span>
  58 + <span class="value"><%= link_to(item.proposal_evaluation.evaluated_by.name, item.proposal_evaluation.evaluated_by.url) %></span>
55 &nbsp; &#151; &nbsp; 59 &nbsp; &#151; &nbsp;
56 <span class="processed"> 60 <span class="processed">
57 - <span class="label"><%= _('Processed:') %></span>  
58 - <span class="value"><%= show_date(item.end_date) %></span> 61 + <span class="label"><%= _('Moderated at') %>:</span>
  62 + <span class="value"><%= show_time(item.proposal_evaluation.created_at) %></span>
59 </span> 63 </span>
60 </div> 64 </div>
61 <% if item.closed_by.present? %> 65 <% if item.closed_by.present? %>
62 <div class="closed-by"> 66 <div class="closed-by">
63 - <span class="label"><%= _('Closed by:') %></span> 67 + <span class="label"><%= _('Evaluator') %>:</span>
64 <span class="value"><%= link_to(item.closed_by.name, item.closed_by.url) %></span> 68 <span class="value"><%= link_to(item.closed_by.name, item.closed_by.url) %></span>
  69 + &nbsp; &#151; &nbsp;
  70 + <span class="processed">
  71 + <span class="label"><%= _('Evaluated at') %>:</span>
  72 + <span class="value"><%= show_time(item.end_date) %></span>
  73 + </span>
65 </div> 74 </div>
66 <% end %> 75 <% end %>
67 </li> 76 </li>