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

#1179 sub-projects

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2020-10-15 09:51:14 +02:00
parent 770579adab
commit e3912119bb
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/redmine_dmsf/webdav/base_resource.rb
View File

@ -190,7 +190,12 @@ module RedmineDmsf
if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
#if name =~ /^\[?.+ (\d+)\]?$/
if name =~ / (\d+)$/
prj = Project.visible.find_by(id: $1, parent_id: parent_project&.id)
#prj = Project.visible.find_by(id: $1, parent_id: parent_project&.id)
if parent_project
prj = Project.visible.find_by(id: $1, parent_id: parent_project.id)
else
prj = Project.visible.find_by(id: $1)
end
if prj
# Check again whether it's really the project and not a folder with a number as a suffix
#prj = nil unless name.include?(DmsfFolder::get_valid_title(prj.name))
@ -201,7 +206,12 @@ module RedmineDmsf
# if name =~ /^\[?([^\]]+)\]?$/
# prj = Project.visible.find_by(identifier: $1, parent_id: parent_project&.id)
# end
prj = Project.visible.find_by(identifier: name, parent_id: parent_project&.id)
#prj = Project.visible.find_by(identifier: name, parent_id: parent_project&.id)
if parent_project
prj = Project.visible.find_by(identifier: name, parent_id: parent_project.id)
else
prj = Project.visible.find_by(identifier: name)
end
end
prj
end