From 770579adabab24168e699eda020ce7d9ffff21dd Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Tue, 13 Oct 2020 08:00:45 +0200
Subject: [PATCH] #1179 sub-projects representation

---
 lib/redmine_dmsf/webdav/base_resource.rb    | 13 ++++++++-----
 lib/redmine_dmsf/webdav/project_resource.rb |  7 +++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb
index 85e93f08..c3d1af9e 100644
--- a/lib/redmine_dmsf/webdav/base_resource.rb
+++ b/lib/redmine_dmsf/webdav/base_resource.rb
@@ -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
diff --git a/lib/redmine_dmsf/webdav/project_resource.rb b/lib/redmine_dmsf/webdav/project_resource.rb
index 50ebf0b9..0e2ab791 100644
--- a/lib/redmine_dmsf/webdav/project_resource.rb
+++ b/lib/redmine_dmsf/webdav/project_resource.rb
@@ -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