Merge branch 'master' into devel-2.0.1

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)

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') %>
       </span>
     </p>

app/views/dmsf_public_urls/_new.html.erb

@@ -21,7 +21,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<span id="public_url" class="hol">
+<span id="public_url" <%= "class='hol'" unless Setting.plugin_redmine_dmsf['dmsf_documents_email_links_only']%>">
     <%= 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') %>