Skip to content

Commit 49fdf5b

Browse files
committed
Refactor initialization logic after dropping support for Redmine 4
1 parent 5100b85 commit 49fdf5b

File tree

1 file changed

+7
-32
lines changed

1 file changed

+7
-32
lines changed

init.rb

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -56,37 +56,12 @@
5656
config.register RGeo::Cartesian.preferred_factory(has_z_coordinate: true, srid: 4326), geo_type: 'geometry', sql_type: "geometry", srid: 4326
5757
end
5858

59-
if Rails.version > '6.0' && Rails.autoloaders.zeitwerk_enabled?
60-
Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path|
61-
Rails.autoloaders.main.ignore(path)
62-
require path
63-
end
64-
RedmineGtt.setup_normal_patches
65-
Rails.application.config.after_initialize do
66-
RedmineGtt.setup_controller_patches
67-
end
68-
else
69-
require 'redmine_gtt'
70-
# Configure View Overrides
71-
Rails.application.paths["app/overrides"] ||= []
72-
Rails.application.paths["app/overrides"] << File.expand_path("../app/overrides", __FILE__)
73-
74-
ActiveSupport::Reloader.to_prepare do
75-
RedmineGtt.setup_normal_patches
76-
77-
# ActiveRecord::Base.include_root_in_json = true
78-
# module RGeo
79-
# module Feature
80-
# module Point
81-
# def as_json(params)
82-
# ::RGeo::GeoJSON.encode(self)
83-
# end
84-
# end
85-
# end
86-
# end
87-
end
59+
Dir.glob("#{Rails.root}/plugins/redmine_gtt/app/overrides/**/*.rb").each do |path|
60+
Rails.autoloaders.main.ignore(path)
61+
require path
62+
end
8863

89-
Rails.configuration.to_prepare do
90-
RedmineGtt.setup_controller_patches
91-
end
64+
RedmineGtt.setup_normal_patches
65+
Rails.application.config.after_initialize do
66+
RedmineGtt.setup_controller_patches
9267
end

0 commit comments

Comments
 (0)