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

Fixed DmsfFile.move_to so it uses container instead of project.

Browse Source
This commit is contained in:
COLA@Redmine.local 2017-02-09 22:01:26 +01:00
parent 7533e8948c
commit 1e770ab50a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/dmsf_file.rb
View File

@ -242,12 +242,13 @@ class DmsfFile < ActiveRecord::Base
projects projects
end end
def move_to(project, folder) def move_to(container, folder)
if self.locked_for_user? if self.locked_for_user?
errors[:base] << l(:error_file_is_locked) errors[:base] << l(:error_file_is_locked)
return false return false
end end
project = container.is_a?(Project) ? container : container.project
# If the target project differs from the source project we must physically move the disk files # If the target project differs from the source project we must physically move the disk files
if self.project != project if self.project != project
self.dmsf_file_revisions.all.each do |rev| self.dmsf_file_revisions.all.each do |rev|
@ -257,7 +258,8 @@ class DmsfFile < ActiveRecord::Base
end end
end end
self.project = project self.container_type = self.container_type
self.container_id = container.id
self.dmsf_folder = folder self.dmsf_folder = folder
new_revision = self.last_revision.clone new_revision = self.last_revision.clone
new_revision.dmsf_file = self new_revision.dmsf_file = self