Merge pull request #7 from gtt-project/feature/support-zeitwerk

Support zeitwerk

Author: sanak

README.md

@@ -4,7 +4,7 @@ This plugin lets you add several privacy related options to Redmine projects
 
 ## Requirements
 
-- Redmine >= 3.4.0
+- Redmine >= 4.0.0
 
 ## Installation
 
@@ -36,13 +36,17 @@ The GTT Project appreciates any [contributions](https://github.com/gtt-project/.
 
 ## Version History
 
+- 2.0.0 Support Redmine 5.0 and drop Redmine <= 3.4 support
+- 1.3.2 Publish on GitHub
+
 See [all releases](https://github.com/gtt-project/redmine_privacy/releases) with release notes.
 
 ## Authors
 
 - [Jens Kraemer](https://github.com/jkraemer)
-- [Ko Nagase](https://github.com/sanak)
 - [Daniel Kastl](https://github.com/dkastl)
+- [Thibault Mutabazi](https://github.com/eyewritecode)
+- [Ko Nagase](https://github.com/sanak)
 - ... [and others](https://github.com/gtt-project/redmine_privacy/graphs/contributors)
 
 ## LICENSE

init.rb

@@ -1,7 +1,14 @@
-require 'redmine'
+require File.expand_path('../lib/redmine_privacy/view_hooks', __FILE__)
 
-Rails.configuration.to_prepare do
-  RedminePrivacy.setup
+if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled?
+  Rails.application.config.after_initialize do
+    RedminePrivacy.setup
+  end
+else
+  require 'redmine_privacy'
+  Rails.configuration.to_prepare do
+    RedminePrivacy.setup
+  end
 end
 
 Redmine::Plugin.register :redmine_privacy do
@@ -10,9 +17,9 @@
   author_url 'https://github.com/georepublic'
   url 'https://github.com/gtt-project/redmine_privacy'
   description 'Adds several privacy related options to Redmine'
-  version '1.3.2'
+  version '2.0.0'
 
-  requires_redmine version_or_higher: '3.4.0'
+  requires_redmine version_or_higher: '4.0.0'
 
   settings default: { }, partial: 'redmine_privacy/settings'
 

lib/redmine_privacy.rb

@@ -28,5 +28,3 @@ def self.displayname_fallback
       User::USER_FORMATS.keys.first
   end
 end
-
-require 'redmine_privacy/view_hooks'

lib/redmine_privacy/patches/projects_controller_patch.rb

@@ -6,17 +6,19 @@ def self.apply
         ProjectsController.prepend self unless ProjectsController < self
       end
 
-
-      def respond_to(*_, &block)
-        if params[:action] == 'show'
-          # having no users effectively hides the project members box
-          if Redmine::VERSION.to_a[0] >= 4 && Redmine::VERSION.to_a[1] >= 2
-            @principals_by_role = []
-          else
-            @users_by_role = []
-          end
+      def show
+        respond_to do |format|
+          format.html {
+            super
+            # having no users effectively hides the project members box
+            if Redmine::VERSION.to_s >= '4.2'
+              @principals_by_role = []
+            else
+              @users_by_role = []
+            end
+          }
+          format.any { super }
         end
-        super(*_, &block)
       end
     end
   end