Commit d6f3d015ee9ea63237f922b01861380252740ed5
1 parent
83da31b0
Exists in
master
and in
8 other branches
Fix email template selection
Showing
2 changed files
with
4 additions
and
7 deletions
Show diff stats
views/proposals_discussion_plugin_tasks/_task_accept_details.html.erb
| 1 | +<%= task_email_template(_('Select an acceptance email template:'), @acceptance_email_templates, task) %> | ||
| 1 | <% unless @view_only %> | 2 | <% unless @view_only %> |
| 2 | <%= f.fields_for 'article', OpenStruct.new(task.article) do |a| %> | 3 | <%= f.fields_for 'article', OpenStruct.new(task.article) do |a| %> |
| 3 | <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target, task.article_parent_id) %> | 4 | <%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target, task.article_parent_id) %> |
views/proposals_discussion_plugin_tasks/_task_reject_details.html.erb
| 1 | -<% if @email_templates.present? %> | ||
| 2 | - <div class="template-selection"> | ||
| 3 | - <%= labelled_form_field(_('Select a rejection email template:'), 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'))) %> | ||
| 4 | - </div> | ||
| 5 | - <% if task.flagged_for_reproval? %> | ||
| 6 | - <script>jQuery( document ).ready(function( $ ) { $("#decision-cancel-<%= task.id %>").click(); });</script> | ||
| 7 | - <% end %> | 1 | +<%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %> |
| 2 | +<% if task.flagged_for_reproval? %> | ||
| 3 | + <script>jQuery( document ).ready(function( $ ) { $("#decision-cancel-<%= task.id %>").click(); });</script> | ||
| 8 | <% end %> | 4 | <% end %> |