Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redmine 5 compatibility patch #23

Open
jcatrysse opened this issue May 4, 2023 · 0 comments
Open

Redmine 5 compatibility patch #23

jcatrysse opened this issue May 4, 2023 · 0 comments

Comments

@jcatrysse
Copy link

Subject: [PATCH] Make compatible with Redmine 5
---
Index: init.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/init.rb b/init.rb
--- a/init.rb	(revision 30412ccbca6ddc1ccd3fb8ce25706e4b30ecc50d)
+++ b/init.rb	(revision 5f25623d7e8cb6ee9a84b5014897dc674d907c71)
@@ -1,5 +1,4 @@
 require 'redmine'
-require_dependency 'redmine_issue_todo_lists/hooks'
 
 Redmine::Plugin.register :redmine_issue_todo_lists do
   name 'Issue To-do Lists Plugin'
@@ -22,12 +21,20 @@
 
   menu :project_menu, :issue_todo_lists, { :controller => 'issue_todo_lists', :action => 'index' }, :caption => :issue_todo_lists_title, :param => :project_id, :after => :activity
 
-  Rails.configuration.to_prepare do
-    unless Project.included_modules.include? RedmineIssueTodoLists::ProjectPatch
+  require File.dirname(__FILE__) + '/lib/redmine_issue_todo_lists/hooks'
+  require File.dirname(__FILE__) + '/lib/redmine_issue_todo_lists/issue_patch'
+  require File.dirname(__FILE__) + '/lib/redmine_issue_todo_lists/project_patch'
+
+  if Rails.configuration.respond_to?(:autoloader) && Rails.configuration.autoloader == :zeitwerk
+    Rails.autoloaders.each { |loader| loader.ignore(File.dirname(__FILE__) + '/lib/redmine_issue_todo_lists') }
+  end
+
+  if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled?
+    Project.send(:include, RedmineIssueTodoLists::ProjectPatch)
+    Issue.send(:include, RedmineIssueTodoLists::IssuePatch)
+  else
+    Rails.configuration.to_prepare do
       Project.send(:include, RedmineIssueTodoLists::ProjectPatch)
-    end
-
-    unless Issue.included_modules.include? RedmineIssueTodoLists::IssuePatch
       Issue.send(:include, RedmineIssueTodoLists::IssuePatch)
     end
   end
Index: lib/redmine_issue_todo_lists/issue_patch.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/lib/redmine_issue_todo_lists/issue_patch.rb b/lib/redmine_issue_todo_lists/issue_patch.rb
--- a/lib/redmine_issue_todo_lists/issue_patch.rb	(revision 30412ccbca6ddc1ccd3fb8ce25706e4b30ecc50d)
+++ b/lib/redmine_issue_todo_lists/issue_patch.rb	(revision 5f25623d7e8cb6ee9a84b5014897dc674d907c71)
@@ -5,7 +5,6 @@
       base.send(:include, InstanceMethods)
 
       base.class_eval do
-        unloadable
 
         after_save :remove_todo_list_allocations
         has_many :issue_todo_list_items, dependent: :destroy
@@ -28,4 +27,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end
Index: lib/redmine_issue_todo_lists/project_patch.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/lib/redmine_issue_todo_lists/project_patch.rb b/lib/redmine_issue_todo_lists/project_patch.rb
--- a/lib/redmine_issue_todo_lists/project_patch.rb	(revision 30412ccbca6ddc1ccd3fb8ce25706e4b30ecc50d)
+++ b/lib/redmine_issue_todo_lists/project_patch.rb	(revision 5f25623d7e8cb6ee9a84b5014897dc674d907c71)
@@ -5,7 +5,6 @@
       base.send(:include, InstanceMethods)
 
       base.class_eval do
-        unloadable
 
         has_many :issue_todo_lists, dependent: :destroy
       end
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant