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

source_revision for dependent revisions is updated on destroy instead of delete.

Browse Source
This commit is contained in:
COLA@Redminetest 2016-11-24 21:37:17 +01:00
parent c7b4e7e1a7
commit d2f3af0b88
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/dmsf_file_revision.rb
View File

@ -83,11 +83,7 @@ class DmsfFileRevision < ActiveRecord::Base
errors[:base] << l(:error_at_least_one_revision_must_be_present)
return false
end
dependent = DmsfFileRevision.where(:source_dmsf_file_revision_id => self.id).all
dependent.each do |d|
d.source_revision = self.source_revision
d.save!
end
if commit
self.destroy
else
@ -104,6 +100,11 @@ class DmsfFileRevision < ActiveRecord::Base
end
def destroy
dependent = DmsfFileRevision.where(:source_dmsf_file_revision_id => self.id).all
dependent.each do |d|
d.source_revision = self.source_revision
d.save!
end
if Setting.plugin_redmine_dmsf['dmsf_really_delete_files']
dependencies = DmsfFileRevision.where(:disk_filename => self.disk_filename).all.count
File.delete(self.disk_file) if dependencies <= 1 && File.exist?(self.disk_file)