From 0f9307fe2c214d197c057747b111976ccd27329a Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Tue, 7 Jul 2015 10:16:19 -0300
Subject: [PATCH] Move email template selection to task partials

---
 app/helpers/task_helper.rb                               | 4 ++--
 app/views/tasks/_approve_article_accept_details.html.erb | 2 ++
 app/views/tasks/_task.html.erb                           | 2 --
 app/views/tasks/_task_reject_details.html.erb            | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/helpers/task_helper.rb b/app/helpers/task_helper.rb
index c6d2dab..1173a1f 100644
--- a/app/helpers/task_helper.rb
+++ b/app/helpers/task_helper.rb
@@ -1,11 +1,11 @@
 module TaskHelper
 
-  def task_email_template(description, email_templates, task)
+  def task_email_template(description, email_templates, task, include_blank=true)
     return '' unless email_templates.present?
 
     content_tag(
       :div,
-      labelled_form_field(description, select_tag("tasks[#{task.id}][task][email_template_id]", options_from_collection_for_select(email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed', :profile => profile.identifier))),
+      labelled_form_field(description, select_tag("tasks[#{task.id}][task][email_template_id]", options_from_collection_for_select(email_templates, :id, :name), :include_blank => include_blank, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed', :profile => profile.identifier))),
       :class => 'template-selection'
     )
   end
diff --git a/app/views/tasks/_approve_article_accept_details.html.erb b/app/views/tasks/_approve_article_accept_details.html.erb
index d0760c9..f0b11b9 100644
--- a/app/views/tasks/_approve_article_accept_details.html.erb
+++ b/app/views/tasks/_approve_article_accept_details.html.erb
@@ -1,3 +1,5 @@
+<%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %>
+
 <%= render :file => 'shared/tiny_mce' %>
 
 <%= labelled_form_field(_('Create a link'), f.check_box(:create_link)) %>
diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb
index 4abe101..d1a4cd2 100644
--- a/app/views/tasks/_task.html.erb
+++ b/app/views/tasks/_task.html.erb
@@ -52,14 +52,12 @@
   <%= fields_for "tasks[#{task.id}][task]", task do |f| %>
     <% if task.accept_details %>
       <div id="on-accept-information-<%=task.id%>" style="display: none">
-        <%= task_email_template(_('Select an acceptance email template:'), @acceptance_email_templates, task) %>
         <%= render :partial => partial_for_class(task.class, nil, :accept_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
 
     <% if task.reject_details %>
       <div id="on-reject-information-<%=task.id%>" style="display: none">
-        <%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %>
         <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %>
       </div>
     <% end %>
diff --git a/app/views/tasks/_task_reject_details.html.erb b/app/views/tasks/_task_reject_details.html.erb
index 13bc80c..bfc8043 100644
--- a/app/views/tasks/_task_reject_details.html.erb
+++ b/app/views/tasks/_task_reject_details.html.erb
@@ -1 +1,3 @@
+<%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %>
+
 <%= labelled_form_field(_('Rejection explanation'), f.text_area(:reject_explanation, :rows => 5)) %>
--
libgit2 0.21.2