diff --git a/after_init.rb b/after_init.rb index 36665353..9e7d3015 100644 --- a/after_init.rb +++ b/after_init.rb @@ -35,7 +35,7 @@ def dmsf_init # Project menu extension Redmine::MenuManager.map :project_menu do |menu| menu.push :dmsf, { controller: 'dmsf', action: 'show' }, caption: :menu_dmsf, before: :documents, - param: :id + param: :id, html: { class: 'icon icon-dmsf' } end # Main menu extension Redmine::MenuManager.map :top_menu do |menu| diff --git a/lib/dav4rack/resources/file_resource.rb b/lib/dav4rack/resources/file_resource.rb index c48a26c8..aa4c616c 100644 --- a/lib/dav4rack/resources/file_resource.rb +++ b/lib/dav4rack/resources/file_resource.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true require 'pstore' -require 'webrick/httputils' +#require 'webrick/httputils' require 'dav4rack/file_resource_lock' require 'dav4rack/security_utils' diff --git a/lib/redmine_dmsf/patches/projects_helper_patch.rb b/lib/redmine_dmsf/patches/projects_helper_patch.rb index f1f1e486..6cca3290 100644 --- a/lib/redmine_dmsf/patches/projects_helper_patch.rb +++ b/lib/redmine_dmsf/patches/projects_helper_patch.rb @@ -44,9 +44,6 @@ module RedmineDmsf end end -if Redmine::Plugin.installed?(:easy_extensions) - RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper', - 'RedmineDmsf::Patches::ProjectHelperPatch', prepend: true -else +unless Redmine::Plugin.installed?(:easy_extensions) ProjectsController.send :helper, RedmineDmsf::Patches::ProjectHelperPatch end \ No newline at end of file