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

#1179 sub-projects representation

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2020-10-13 08:00:45 +02:00
parent 6b83425dac
commit 770579adab
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,17 +188,20 @@ module RedmineDmsf
def self.get_project(name, parent_project)
prj = nil
if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
if name =~ /^\[?.+ (\d+)\]?$/
#if name =~ /^\[?.+ (\d+)\]?$/
if name =~ / (\d+)$/
prj = Project.visible.find_by(id: $1, parent_id: parent_project&.id)
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))
#prj = nil unless name.include?(DmsfFolder::get_valid_title(prj.name))
prj = nil unless name.start_with?(DmsfFolder::get_valid_title(prj.name))
end
end
else
if name =~ /^\[?([^\]]+)\]?$/
prj = Project.visible.find_by(identifier: $1, parent_id: parent_project&.id)
end
# 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)
end
prj
end

7
lib/redmine_dmsf/webdav/project_resource.rb
View File

@ -75,7 +75,8 @@ module RedmineDmsf
end
def long_name
'[' + project&.name + ']'
#'[' + project&.name + ']'
project&.name
end
def content_type
@ -118,9 +119,11 @@ module RedmineDmsf
def self.create_project_name(prj)
if prj
if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
#"[#{DmsfFolder::get_valid_title(prj.name)} #{prj.id}]"
"#{DmsfFolder::get_valid_title(prj.name)} #{prj.id}"
else
"[#{prj.identifier}]"
#"[#{prj.identifier}]"
prj.identifier
end
end
end