Merge pull request #130 from gtt-project/feature/separate-reload-patch-timing

Separate reload patches timing

Author: sanak

init.rb

@@ -42,7 +42,7 @@
   # Automatically encode points to geojson with as_json in rails3
   RGeo::ActiveRecord::GeometryMixin.set_json_generator(:geojson)
 
-  RedmineGtt.setup
+  RedmineGtt.setup_normal_patches
 
   # ActiveRecord::Base.include_root_in_json = true
   # module RGeo
@@ -56,6 +56,10 @@
   # end
 end
 
+Rails.configuration.to_prepare do
+  RedmineGtt.setup_controller_patches
+end
+
 class GttListener < Redmine::Hook::ViewListener
   render_on :view_layouts_base_html_head, inline: <<-END
       <%= stylesheet_link_tag 'gtt', :plugin => 'redmine_gtt' %>

lib/redmine_gtt.rb

@@ -28,17 +28,28 @@
 
 module RedmineGtt
 
-  def self.setup
+  def self.setup_normal_patches
     RedmineGtt::Patches::IssuesHelperPatch.apply
 
     RedmineGtt::Patches::IssuePatch.apply
     RedmineGtt::Patches::IssueQueryPatch.apply
     RedmineGtt::Patches::ProjectPatch.apply
     RedmineGtt::Patches::UserPatch.apply
 
+    RedmineGtt::Patches::ProjectsHelperPatch.apply
+
+    # unless IssueQuery.included_modules.include?(RedmineGtt::Patches::IssueQueryPatch)
+    # 	IssueQuery.send(:include, RedmineGtt::Patches::IssueQueryPatch)
+    # end
+
+
+    #Redmine::Views::ApiTemplateHandler.send(:prepend, RedmineGtt::Patches::ApiTemplateHandlerPatch)
+  end
+
+  def self.setup_controller_patches
+
     RedmineGtt::Patches::IssuesControllerPatch.apply
     RedmineGtt::Patches::ProjectsControllerPatch.apply
-    RedmineGtt::Patches::ProjectsHelperPatch.apply
     RedmineGtt::Patches::UsersControllerPatch.apply
 
     [
@@ -47,13 +58,6 @@ def self.setup
       ProjectsController,
       UsersController,
     ].each{ |c| c.send :helper, 'gtt_map' }
-
-    # unless IssueQuery.included_modules.include?(RedmineGtt::Patches::IssueQueryPatch)
-    # 	IssueQuery.send(:include, RedmineGtt::Patches::IssueQueryPatch)
-    # end
-
-
-    #Redmine::Views::ApiTemplateHandler.send(:prepend, RedmineGtt::Patches::ApiTemplateHandlerPatch)
   end
 end