From 9dd2d08f78daac6daa1aa62065472a48519d2647 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Tue, 4 May 2021 12:25:39 +0200 Subject: [PATCH] Edit content returns 409 Conflict --- lib/redmine_dmsf/webdav/base_resource.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb index 8a2e7c52..88f0b336 100644 --- a/lib/redmine_dmsf/webdav/base_resource.rb +++ b/lib/redmine_dmsf/webdav/base_resource.rb @@ -189,9 +189,12 @@ module RedmineDmsf def self.get_project(scope, name, parent_project) prj = nil + if parent_project + scope = scope.where(parent_id: parent_project.id) + end if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] if name =~ /^\[?.+ (\d+)\]?$/ - prj = scope.find_by(id: $1, parent_id: parent_project&.id) + prj = scope.find_by(id: $1) if prj # Check again whether it's really the project and not a folder with a number as a suffix prj = nil unless name.start_with?('[' + DmsfFolder::get_valid_title(prj.name)) @@ -203,7 +206,7 @@ module RedmineDmsf else identifier = name end - prj = scope.find_by(identifier: identifier, parent_id: parent_project&.id) + prj = scope.find_by(identifier: identifier) end prj end