From 546ebd90b9b051948d22540e8c0063abff7f7def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?=
Date: Fri, 22 Mar 2019 15:44:43 +0100
Subject: [PATCH] #986 Cannot send documents by email
---
app/models/dmsf_mailer.rb | 2 +-
app/views/dmsf/email_entries.html.erb | 4 +++-
app/views/dmsf_public_urls/_new.html.erb | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/models/dmsf_mailer.rb b/app/models/dmsf_mailer.rb
index cf2cda02..def6f61d 100644
--- a/app/models/dmsf_mailer.rb
+++ b/app/models/dmsf_mailer.rb
@@ -66,7 +66,7 @@ class DmsfMailer < Mailer
end
def self.deliver_send_documents(project, email_params)
- send_documents(User.current, project, email_params).deliver_later
+ send_documents(User.current, project, email_params).deliver_now
end
def send_documents(_, project, email_params)
diff --git a/app/views/dmsf/email_entries.html.erb b/app/views/dmsf/email_entries.html.erb
index a98e1e57..1533ee76 100644
--- a/app/views/dmsf/email_entries.html.erb
+++ b/app/views/dmsf/email_entries.html.erb
@@ -62,7 +62,9 @@
:path => @email_params[:zipped_content]) %>
<%= l(:label_or) %>
<%= check_box_tag('email[links_only]', 1, Setting.plugin_redmine_dmsf['dmsf_documents_email_links_only'],
- :onchange => "$('#public_url').toggle()") %> <%= l(:label_links_only) %>
+ :onchange => "$('#public_url').toggle($('#email_links_only').prop('checked'))")
+ %>
+ <%= l(:label_links_only) %>
<%= render(:partial => 'dmsf_public_urls/new') %>
diff --git a/app/views/dmsf_public_urls/_new.html.erb b/app/views/dmsf_public_urls/_new.html.erb
index d0b6b769..b9502952 100644
--- a/app/views/dmsf_public_urls/_new.html.erb
+++ b/app/views/dmsf_public_urls/_new.html.erb
@@ -21,7 +21,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%>
-
+">
<%= check_box_tag('email[public_urls]', 1, false) %> <%= l(:label_public_urls) %>
<%= date_field_tag('email[expired_at]', '', :value => (DateTime.current + 3.days).to_date, :size => 10,
:readonly => true) + calendar_for('email_expired_at') %>