Commit 0f9307fe2c214d197c057747b111976ccd27329a
1 parent
8a4dc901
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Move email template selection to task partials
Showing
4 changed files
with
6 additions
and
4 deletions
Show diff stats
app/helpers/task_helper.rb
| 1 | module TaskHelper | 1 | module TaskHelper |
| 2 | 2 | ||
| 3 | - def task_email_template(description, email_templates, task) | 3 | + def task_email_template(description, email_templates, task, include_blank=true) |
| 4 | return '' unless email_templates.present? | 4 | return '' unless email_templates.present? |
| 5 | 5 | ||
| 6 | content_tag( | 6 | content_tag( |
| 7 | :div, | 7 | :div, |
| 8 | - 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))), | 8 | + 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))), |
| 9 | :class => 'template-selection' | 9 | :class => 'template-selection' |
| 10 | ) | 10 | ) |
| 11 | end | 11 | end |
app/views/tasks/_approve_article_accept_details.html.erb
| 1 | +<%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %> | ||
| 2 | + | ||
| 1 | <%= render :file => 'shared/tiny_mce' %> | 3 | <%= render :file => 'shared/tiny_mce' %> |
| 2 | 4 | ||
| 3 | <%= labelled_form_field(_('Create a link'), f.check_box(:create_link)) %> | 5 | <%= labelled_form_field(_('Create a link'), f.check_box(:create_link)) %> |
app/views/tasks/_task.html.erb
| @@ -52,14 +52,12 @@ | @@ -52,14 +52,12 @@ | ||
| 52 | <%= fields_for "tasks[#{task.id}][task]", task do |f| %> | 52 | <%= fields_for "tasks[#{task.id}][task]", task do |f| %> |
| 53 | <% if task.accept_details %> | 53 | <% if task.accept_details %> |
| 54 | <div id="on-accept-information-<%=task.id%>" style="display: none"> | 54 | <div id="on-accept-information-<%=task.id%>" style="display: none"> |
| 55 | - <%= task_email_template(_('Select an acceptance email template:'), @acceptance_email_templates, task) %> | ||
| 56 | <%= render :partial => partial_for_class(task.class, nil, :accept_details), :locals => {:task => task, :f => f} %> | 55 | <%= render :partial => partial_for_class(task.class, nil, :accept_details), :locals => {:task => task, :f => f} %> |
| 57 | </div> | 56 | </div> |
| 58 | <% end %> | 57 | <% end %> |
| 59 | 58 | ||
| 60 | <% if task.reject_details %> | 59 | <% if task.reject_details %> |
| 61 | <div id="on-reject-information-<%=task.id%>" style="display: none"> | 60 | <div id="on-reject-information-<%=task.id%>" style="display: none"> |
| 62 | - <%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %> | ||
| 63 | <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %> | 61 | <%= render :partial => partial_for_class(task.class, nil, :reject_details), :locals => {:task => task, :f => f} %> |
| 64 | </div> | 62 | </div> |
| 65 | <% end %> | 63 | <% end %> |
app/views/tasks/_task_reject_details.html.erb
| 1 | +<%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %> | ||
| 2 | + | ||
| 1 | <%= labelled_form_field(_('Rejection explanation'), f.text_area(:reject_explanation, :rows => 5)) %> | 3 | <%= labelled_form_field(_('Rejection explanation'), f.text_area(:reject_explanation, :rows => 5)) %> |