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

On PUT request, if previous revision size was 0 then just update that revision.

Browse Source
This commit is contained in:
COLA@Redminetest 2016-11-02 16:55:44 +01:00
parent 84b162761d
commit b5348ab4b2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/redmine_dmsf/webdav/dmsf_resource.rb
View File

@ -272,7 +272,7 @@ module RedmineDmsf
User.current.allowed_to?(:folder_manipulation, resource.project)
if dest.exist?
methodNotAllowed
MethodNotAllowed
# Files cannot be merged at this point, until a decision is made on how to merge them
# ideally, we would merge revision history for both, ensuring the origin file wins with latest revision.
else
@ -481,11 +481,16 @@ module RedmineDmsf
if exist? # We're over-writing something, so ultimately a new revision
f = file
last_revision = file.last_revision
new_revision.source_revision = last_revision
if last_revision
new_revision.major_version = last_revision.major_version
new_revision.minor_version = last_revision.minor_version
new_revision.workflow = last_revision.workflow
if last_revision.size == 0
new_revision = last_revision
new_revision.minor_version -= 1
else
new_revision.source_revision = last_revision
if last_revision
new_revision.major_version = last_revision.major_version
new_revision.minor_version = last_revision.minor_version
new_revision.workflow = last_revision.workflow
end
end
else
raise BadRequest unless (parent.projectless_path == '/' || (parent.exist? && parent.folder))
@ -644,4 +649,4 @@ module RedmineDmsf
end
end
end
end