From 86fdb76c1e058c4874eed65348a57cc68e1089ff Mon Sep 17 00:00:00 2001 From: "COLA@Redminetest" Date: Mon, 7 Nov 2016 00:14:44 +0100 Subject: [PATCH] If reusing a revision because the last had zero size then don't generate a new filename. --- lib/redmine_dmsf/webdav/dmsf_resource.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb index daceee2b..fbe02371 100644 --- a/lib/redmine_dmsf/webdav/dmsf_resource.rb +++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb @@ -513,6 +513,7 @@ module RedmineDmsf end new_revision = DmsfFileRevision.new + reuse_revision = false if exist? # We're over-writing something, so ultimately a new revision f = file @@ -520,6 +521,7 @@ module RedmineDmsf if last_revision.size == 0 new_revision = last_revision new_revision.minor_version -= 1 + reuse_revision = true else new_revision.source_revision = last_revision if last_revision @@ -561,7 +563,7 @@ module RedmineDmsf raise InternalServerError unless new_revision.valid? && f.save - new_revision.disk_filename = new_revision.new_storage_filename + new_revision.disk_filename = new_revision.new_storage_filename unless reuse_revision if new_revision.save f.reload