redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel-2.4.4

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2020-06-16 14:41:53 +02:00
commit 1c26c81f9f
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/dmsf_controller.rb
View File

@ -185,7 +185,11 @@ class DmsfController < ApplicationController
flash[:error] = l(:error_email_to_must_be_entered)
else
DmsfMailer.deliver_send_documents(@project, params[:email].permit!, User.current)
File.delete(params[:email][:zipped_content])
if(File.exist?(params[:email][:zipped_content]))
File.delete(params[:email][:zipped_content])
else
flash[:error] = l(:header_minimum_filesize)
end
flash[:notice] = l(:notice_email_sent, params[:email][:to])
end
redirect_to dmsf_folder_path(id: @project, folder_id: @folder)

8
app/models/dmsf_mailer.rb
View File

@ -84,8 +84,12 @@ class DmsfMailer < Mailer
@files = email_params[:files]
@author = author
unless @links_only
zipped_content_data = open(email_params[:zipped_content], 'rb') { |io| io.read }
attachments['Documents.zip'] = { content_type: 'application/zip', content: zipped_content_data }
if File.exist?(email_params[:zipped_content])
zipped_content_data = open(email_params[:zipped_content], 'rb') { |io| io.read }
attachments['Documents.zip'] = { content_type: 'application/zip', content: zipped_content_data }
else
Rails.logger.error "Cannot attach #{email_params[:zipped_content]}, it doesn't exist."
end
end
mail to: email_params[:to], cc: email_params[:cc], subject: email_params[:subject], 'From' => email_params[:from],
'Reply-To' => email_params[:reply_to]

14
app/views/dmsf_context_menus/_file.html.erb
View File

@ -28,11 +28,15 @@
<%= link_to "#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(id: dmsf_file),
title: l(:title_copy), class: 'icon icon-copy', disabled: !dmsf_link.nil? %>
</li>
<%= link_to l(:label_link_to),
new_dmsf_link_path(project_id: project.id,
dmsf_folder_id: dmsf_file.dmsf_folder ? dmsf_file.dmsf_folder.id : nil,
dmsf_file_id: dmsf_file.id, type: 'link_to'),
title: l(:title_create_link), class: 'icon icon-link' %>
<% unless dmsf_link %>
<li>
<%= link_to l(:label_link_to),
new_dmsf_link_path(project_id: project.id,
dmsf_folder_id: dmsf_file.dmsf_folder ? dmsf_file.dmsf_folder.id : nil,
dmsf_file_id: dmsf_file.id, type: 'link_to'),
title: l(:title_create_link), class: 'icon icon-link' %>
</li>
<% end %>
<li>
<% if locked %>
<%= context_menu_link l(:button_unlock), unlock_dmsf_files_path(id: dmsf_file), class: 'icon icon-unlock',

12
app/views/dmsf_context_menus/_folder.html.erb
View File

@ -28,11 +28,13 @@
<%= context_menu_link "#{l(:button_copy)}/#{l(:button_move)}", copy_folder_path(id: dmsf_folder),
class: 'icon icon-copy', disabled: !allowed || locked %>
</li>
<li>
<%= context_menu_link l(:label_link_to),
new_dmsf_link_path(project_id: project.id, dmsf_folder_id: dmsf_folder.id, type: 'link_to'),
class: 'icon icon-link', disabled: !allowed || locked %>
</li>
<% unless dmsf_link %>
<li>
<%= context_menu_link l(:label_link_to),
new_dmsf_link_path(project_id: project.id, dmsf_folder_id: dmsf_folder.id, type: 'link_to'),
class: 'icon icon-link' %>
</li>
<% end %>
<li>
<% if locked %>
<%= context_menu_link l(:button_unlock), unlock_dmsf_path(id: project, folder_id: dmsf_folder),