diff --git a/app/views/dmsf_mailer/files_deleted.text.erb b/app/views/dmsf_mailer/files_deleted.text.erb index fe62eee3..92cbd16f 100644 --- a/app/views/dmsf_mailer/files_deleted.text.erb +++ b/app/views/dmsf_mailer/files_deleted.text.erb @@ -21,7 +21,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.%> -<%= User.current.name %> <%= l(:text_email_doc_deleted) %> <%= @project.name %> <%= l(:text_email_doc_follows) %> +<%= @author.name %> <%= l(:text_email_doc_deleted) %> <%= @project.name %> <%= l(:text_email_doc_follows) %> <% @files.each do |file| %> <%= h(file.dmsf_path_str) %> (<%= file.name %>) <% if file.last_revision %> diff --git a/app/views/dmsf_mailer/files_updated.html.erb b/app/views/dmsf_mailer/files_updated.html.erb index 33f82505..3af0256d 100644 --- a/app/views/dmsf_mailer/files_updated.html.erb +++ b/app/views/dmsf_mailer/files_updated.html.erb @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.%> -<%= link_to User.current, user_url(User.current) %> <%= l(:text_email_doc_updated) %> +<%= link_to @author, user_url(@author) %> <%= l(:text_email_doc_updated) %> <%= link_to @project, project_url(@project) %> <%= l(:text_email_doc_follows) %> <% @files.each do |file| %>
diff --git a/app/views/dmsf_mailer/files_updated.text.erb b/app/views/dmsf_mailer/files_updated.text.erb index f5a49309..b2829104 100644 --- a/app/views/dmsf_mailer/files_updated.text.erb +++ b/app/views/dmsf_mailer/files_updated.text.erb @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.%> -<%= User.current.name %> <%= l(:text_email_doc_updated) %> +<%= @author.name %> <%= l(:text_email_doc_updated) %> <%= @project.name %> <%= l(:text_email_doc_follows) %> <% @files.each do |file| %> <%= h(file.dmsf_path_str) %> (<%= file.name %>), diff --git a/app/views/dmsf_mailer/send_documents.html.erb b/app/views/dmsf_mailer/send_documents.html.erb index 054ebb33..6db67c95 100644 --- a/app/views/dmsf_mailer/send_documents.html.erb +++ b/app/views/dmsf_mailer/send_documents.html.erb @@ -41,7 +41,7 @@ <% if @public_urls %> <% dmsf_public_url = DmsfPublicUrl.new %> <% dmsf_public_url.dmsf_file = file %> - <% dmsf_public_url.user = User.current %> + <% dmsf_public_url.user = @author %> <% dmsf_public_url.expire_at = @expired_at %> <% dmsf_public_url.save %> <%= link_to(h(file.title), dmsf_public_urls_url(:token => dmsf_public_url.token)) %> @@ -68,7 +68,7 @@ <% if @public_urls %> <% dmsf_public_url = DmsfPublicUrl.new %> <% dmsf_public_url.dmsf_file = file %> - <% dmsf_public_url.user = User.current %> + <% dmsf_public_url.user = @author %> <% dmsf_public_url.expire_at = @expired_at %> <% dmsf_public_url.save %> <%= link_to(h(file.title), dmsf_public_urls_url(:token => dmsf_public_url.token)) %> diff --git a/app/views/dmsf_mailer/send_documents.text.erb b/app/views/dmsf_mailer/send_documents.text.erb index 1cc6935a..900041e1 100644 --- a/app/views/dmsf_mailer/send_documents.text.erb +++ b/app/views/dmsf_mailer/send_documents.text.erb @@ -39,7 +39,7 @@ <% if @public_urls %> <% dmsf_public_url = DmsfPublicUrl.new %> <% dmsf_public_url.dmsf_file = file %> - <% dmsf_public_url.user = User.current %> + <% dmsf_public_url.user = @author %> <% dmsf_public_url.expire_at = @expired_at %> <% dmsf_public_url.save %> <%= dmsf_public_urls_url(:token => dmsf_public_url.token) %> @@ -61,7 +61,7 @@ <% if @public_urls %> <% dmsf_public_url = DmsfPublicUrl.new %> <% dmsf_public_url.dmsf_file = file %> - <% dmsf_public_url.user = User.current %> + <% dmsf_public_url.user = @author %> <% dmsf_public_url.expire_at = @expired_at %> <% dmsf_public_url.save %> <%= dmsf_public_urls_url(:token => dmsf_public_url.token) %> diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 3eb9b36d..ca11080f 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -88,6 +88,20 @@ table.display thead th div.DataTables_sort_wrapper span { display: block; } +/* Comptibility with Easy SW: sorting icons are not visible do */ +.ui-state-default .ui-icon { + background-image: url("../../../stylesheets/jquery/images/ui-icons_759fcf_256x240.png"); +} + +.ui-icon-triangle-1-n { + background-position: 0 -16px; +} + +.ui-icon-triangle-1-s { + background-position: -64px -16px; +} +/* end */ + .dmsf_controls, .dmsf_controls input, .dmsf_controls select, diff --git a/db/migrate/20170421101901_dmsf_file_container_rollback.rb b/db/migrate/20170421101901_dmsf_file_container_rollback.rb index 78dee662..92dd3738 100644 --- a/db/migrate/20170421101901_dmsf_file_container_rollback.rb +++ b/db/migrate/20170421101901_dmsf_file_container_rollback.rb @@ -44,12 +44,16 @@ class DmsfFileContainerRollback < ActiveRecord::Migration[4.2] new_folder_ids << parent.id end # Issue folder - folder = DmsfFolder.new - folder.project_id = issue.project.id - folder.dmsf_folder_id = parent.id - folder.title = "#{issue.id} - #{issue.subject}" - folder.user_id = User.anonymous.id - folder.save! + title = "#{issue.id} - #{DmsfFolder.get_valid_title(issue.subject)}" + folder = DmsfFolder.find_by(project_id: issue.project.id, dmsf_folder_id: parent.id, title: title) + unless folder + folder = DmsfFolder.new + folder.project_id = issue.project.id + folder.dmsf_folder_id = parent.id + folder.title = "#{issue.id} - #{DmsfFolder.get_valid_title(issue.subject)}" + folder.user_id = User.anonymous.id + folder.save! + end new_folder_ids << folder.id # Move the file into the new folder file.dmsf_folder_id = folder.id diff --git a/test/unit/dmsf_mailer_test.rb b/test/unit/dmsf_mailer_test.rb index 0c008da4..3c053c9a 100644 --- a/test/unit/dmsf_mailer_test.rb +++ b/test/unit/dmsf_mailer_test.rb @@ -73,7 +73,7 @@ class DmsfMailerTest < RedmineDmsf::Test::UnitTest email_params[:expired_at] = DateTime.current.to_s email_params[:folders] = nil email_params[:files] = "[\"#{@file1.id}\"]" - DmsfMailer.deliver_send_documents(@file1.project, email_params) + DmsfMailer.deliver_send_documents(@file1.project, email_params, User.current) email = last_email assert text_part(email).body.include? body assert html_part(email).body.include? body