From a973b632145f57b6409cac8b4e55681d777b251f Mon Sep 17 00:00:00 2001 From: "COLA@Redminetest" Date: Fri, 17 Mar 2017 14:01:15 +0100 Subject: [PATCH] Changed project webdav path to -id- instead of [id]. --- lib/redmine_dmsf/webdav/base_resource.rb | 2 +- lib/redmine_dmsf/webdav/project_resource.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb index fbd67438..ee64ebc6 100644 --- a/lib/redmine_dmsf/webdav/base_resource.rb +++ b/lib/redmine_dmsf/webdav/base_resource.rb @@ -168,7 +168,7 @@ module RedmineDmsf pinfo = @path.split('/').drop(1) if pinfo.length > 0 if use_project_names - unless pinfo.first.match('(\[([0-9]+)\])$').nil? + unless pinfo.first.match('(-([0-9]+)-)$').nil? pid = $2 begin @project = Project.find_by_id(pid) diff --git a/lib/redmine_dmsf/webdav/project_resource.rb b/lib/redmine_dmsf/webdav/project_resource.rb index dfce0434..3329e9d2 100644 --- a/lib/redmine_dmsf/webdav/project_resource.rb +++ b/lib/redmine_dmsf/webdav/project_resource.rb @@ -117,7 +117,7 @@ module RedmineDmsf end # Characters that MATCH this regex will be replaced with dots, no more than one dot in a row. - INVALID_CHARACTERS = /[\/\\\?":<>#%\*]/.freeze # = / \ ? " : < > # % * + INVALID_CHARACTERS = /[\/\\\?":<>#%\*\[\]]/.freeze # = / \ ? " : < > # % * [ ] def self.create_project_name(p) use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] @@ -125,7 +125,7 @@ module RedmineDmsf # 1. Invalid characters are replaced with a dot. # 2. Two or more dots in a row are replaced with a single dot. # (3. Windows WebClient does not like a dot at the end, but since the project id tag is appended this is not a problem.) - "#{p.name.gsub(INVALID_CHARACTERS, ".").gsub(/\.{2,}/, ".")} [#{p.id}]" unless p.nil? + "#{p.name.gsub(INVALID_CHARACTERS, ".").gsub(/\.{2,}/, ".")} -#{p.id}-" unless p.nil? else p.identifier unless p.nil? end