From fbce894febce40862561fb4e188f94ba41c3ae46 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Tue, 9 Feb 2021 09:58:22 +0100 Subject: [PATCH] #1133 Cadaver --- lib/dav4rack/controller.rb | 4 +--- lib/redmine_dmsf/webdav/base_resource.rb | 10 ++++++++++ lib/redmine_dmsf/webdav/dmsf_resource.rb | 10 ---------- lib/redmine_dmsf/webdav/project_resource.rb | 1 + 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/dav4rack/controller.rb b/lib/dav4rack/controller.rb index 91f3c5c1..a042ec3a 100644 --- a/lib/dav4rack/controller.rb +++ b/lib/dav4rack/controller.rb @@ -240,7 +240,6 @@ module DAV4Rack return MultiStatus end - properties = if propfind.nil? or propfind.empty? or propfind.xpath("//#{ns}allprop").first @@ -275,6 +274,7 @@ module DAV4Rack r.multistatus do |xml| xml << r.raw(prop_xml) end + MultiStatus end @@ -320,8 +320,6 @@ module DAV4Rack asked[:timeout] = timeout.split(',').map{|x|x.strip} end - Rails.logger.info ">>> #{request.document}" - ns = request.ns if doc = request.document and lockinfo = doc.xpath("//#{ns}lockinfo") diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb index 7c3c0643..796a3f43 100644 --- a/lib/redmine_dmsf/webdav/base_resource.rb +++ b/lib/redmine_dmsf/webdav/base_resource.rb @@ -216,6 +216,16 @@ module RedmineDmsf prj end + # Adds the given xml namespace to namespaces and returns the prefix + def add_namespace(ns, prefix = "unknown#{rand 65536}") + @__proxy.add_namespace ns, prefix + end + + # returns the prefix for the given namespace, adding it if necessary + def prefix_for(ns_href) + @__proxy.prefix_for ns_href + end + private def get_resource_info diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb index 4ac42233..cb1c08a9 100644 --- a/lib/redmine_dmsf/webdav/dmsf_resource.rb +++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb @@ -672,16 +672,6 @@ module RedmineDmsf x end - # Adds the given xml namespace to namespaces and returns the prefix - def add_namespace(ns, prefix = "unknown#{rand 65536}") - @__proxy.add_namespace ns, prefix - end - - # returns the prefix for the given namespace, adding it if necessary - def prefix_for(ns_href) - @__proxy.prefix_for ns_href - end - private # Prepare file for download using Rack functionality: diff --git a/lib/redmine_dmsf/webdav/project_resource.rb b/lib/redmine_dmsf/webdav/project_resource.rb index e1702f11..e4cea810 100644 --- a/lib/redmine_dmsf/webdav/project_resource.rb +++ b/lib/redmine_dmsf/webdav/project_resource.rb @@ -127,4 +127,5 @@ module RedmineDmsf end end + end