diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 8e295868..fc35bcd2 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -197,10 +197,10 @@ class DmsfFile < ActiveRecord::Base new_revision.custom_values << CustomValue.new({:custom_field => cv.custom_field, :value => cv.value}) end - # If the target project differs from the source project we must physically move the file + # If the target project differs from the source project we must physically copy the file if self.project != new_revision.project if File.exist? self.last_revision.disk_file - FileUtils.mv self.last_revision.disk_file, new_revision.disk_file + FileUtils.cp self.last_revision.disk_file, new_revision.disk_file end end diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index e08c774c..371c5776 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -1,9 +1,9 @@ <%#= # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2011 Vít Jonáš -# Copyright (C) 2012 Daniel Munn -# Copyright (C) 2013 Karel Pičman +# Copyright (C) 2011 Vít Jonáš +# Copyright (C) 2012 Daniel Munn +# Copyright (C) 2011-14 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -44,7 +44,7 @@ new_dmsf_link_path(:project_id => @project.id, :dmsf_folder_id => @file.folder ? @file.folder.id : nil, :dmsf_file_id => @file.id, :type => 'link_to'), :title => l(:link_create_link), :class => 'icon icon-link') %> - <%= link_to(l(:button_copy), copy_file_path(:id => @file), + <%= link_to("#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(:id => @file), :title => l(:title_copy), :class => 'icon icon-copy') %> <%= delete_link @file %> <% else %>