Enhance compatibility with Redmine 5

app/overrides/roles/permissions.rb

@@ -20,4 +20,4 @@
 Deface::Override.new :virtual_path => 'roles/permissions',
                      :name => 'add-trackers-permissions-box',
                      :insert_after => ".permissions",
-                     :partial    => "roles/trackers_permissions.html"
+                     :partial    => "roles/trackers_permissions"

init.rb

@@ -1,32 +1,5 @@
 require 'redmine'
-require 'redmine_tiny_features/hooks'
-
-Rails.application.config.to_prepare do
-  require_dependency 'redmine_tiny_features/custom_field_enumeration_patch'
-  require_dependency 'redmine_tiny_features/custom_field_patch'
-  require_dependency 'redmine_tiny_features/field_format_patch'
-  require_dependency 'redmine_tiny_features/issue_query_patch'
-  require_dependency 'redmine_tiny_features/issue_patch'
-  require_dependency 'redmine_tiny_features/issue_status_patch'
-  require_dependency 'redmine_tiny_features/issue_statuses_helper_patch'
-  require_dependency 'redmine_tiny_features/issues_helper_patch'
-  require_dependency 'redmine_tiny_features/issues_controller_patch'
-  require_dependency 'redmine_tiny_features/journal_patch'
-  require_dependency 'redmine_tiny_features/mailer_patch'
-  require_dependency 'redmine_tiny_features/principal_patch'
-  require_dependency 'redmine_tiny_features/project_query_patch'
-  require_dependency 'redmine_tiny_features/project_patch'
-  require_dependency 'redmine_tiny_features/projects_helper_patch'
-  require_dependency 'redmine_tiny_features/queries_helper_patch'
-  require_dependency 'redmine_tiny_features/query_patch'
-  require_dependency 'redmine_tiny_features/queries_controller_patch'
-  require_dependency 'redmine_tiny_features/roles_controller_patch'
-  require_dependency 'redmine_tiny_features/tracker_patch'
-  require_dependency 'redmine_tiny_features/time_entry_query_patch'
-  require_dependency 'redmine_tiny_features/user_patch'
-  require_dependency 'redmine_tiny_features/users_helper_patch'
-  require_dependency 'redmine_tiny_features/user_preference_patch'
-end
+require_relative 'lib/redmine_tiny_features/hooks'
 
 Redmine::Plugin.register :redmine_tiny_features do
   name 'Redmine Tiny Features plugin'

lib/redmine_tiny_features/custom_field_enumeration_patch.rb

@@ -1,5 +1,13 @@
 require_dependency 'custom_field_enumeration'
 
-class CustomFieldEnumeration < ActiveRecord::Base
-	has_many :disabled_custom_field_enumerations,  :dependent => :delete_all
-end
+module RedmineTinyFeatures
+	module CustomFieldEnumerationPatch
+		def self.included(base)
+			base.class_eval do
+				has_many :disabled_custom_field_enumerations,  :dependent => :delete_all
+			end
+		end
+	end
+end
+
+CustomFieldEnumeration.send(:include, RedmineTinyFeatures::CustomFieldEnumerationPatch)

lib/redmine_tiny_features/custom_field_patch.rb

@@ -1,8 +1,17 @@
 require_dependency 'custom_field'
 
-class CustomField < ActiveRecord::Base
-	##### PATCH ,to call the destroy method of (CustomFieldEnumeration has :dependent => :delete_all)
-	has_many :enumerations, lambda {order(:position)},
-			:class_name => 'CustomFieldEnumeration',
-			:dependent => :destroy
-end
+module RedmineTinyFeatures
+	module CustomFieldPatch
+		def self.included(base)
+			base.class_eval do
+				has_many :enumerations, lambda {order(:position)},
+								 :class_name => 'CustomFieldEnumeration',
+								 :dependent => :destroy
+
+				safe_attributes("steps", "min_value", "max_value")
+			end
+		end
+	end
+end
+
+CustomField.send(:include, RedmineTinyFeatures::CustomFieldPatch)

lib/redmine_tiny_features/field_format_patch.rb

@@ -1,9 +1,9 @@
 require 'redmine/field_format'
 
-module Redmine
-  module FieldFormat
+module RedmineTinyFeatures
+  module FieldFormatPatch
 
-    class EnumerationFormat < RecordList
+    module EnumerationFormat
       def possible_values_records(custom_field, object = nil)
         enumerations = custom_field.enumerations.active
         if object.present? && object.try(:project).present?
@@ -14,9 +14,9 @@ def possible_values_records(custom_field, object = nil)
       end
     end
 
-    class List < Base
+    module List
       # Renders the edit tag as check box or radio tags
-      def check_box_edit_tag(view, tag_id, tag_name, custom_value, options={})
+      def check_box_edit_tag(view, tag_id, tag_name, custom_value, options = {})
         opts = []
         unless custom_value.custom_field.multiple? || custom_value.custom_field.is_required?
           opts << ["(#{l(:label_none)})", '']
@@ -47,59 +47,60 @@ def check_box_edit_tag(view, tag_id, tag_name, custom_value, options={})
         view.content_tag('span', s, options.merge(:class => css))
       end
     end
+  end
+end
 
-    class RangeFormat < Numeric
-      add 'range'
+Redmine::FieldFormat::EnumerationFormat.prepend RedmineTinyFeatures::FieldFormatPatch::EnumerationFormat
+Redmine::FieldFormat::List.prepend RedmineTinyFeatures::FieldFormatPatch::List
 
-      self.form_partial = 'custom_fields/formats/range'
+module Redmine::FieldFormat
+  class RangeFormat < Numeric
+    add 'range'
 
-      def label
-        "label_range"
-      end
+    self.form_partial = 'custom_fields/formats/range'
+
+    def label
+      "label_range"
+    end
 
-      field_attributes :steps, :min_value, :max_value
-
-      def edit_tag(view, tag_id, tag_name, custom_value, options = {})
-        edit_tag = view.range_field_tag(tag_name,
-                                        custom_value.value || custom_value.custom_field.default_value,
-                                        options.merge(id: tag_id,
-                                                      min: custom_value.custom_field.min_value,
-                                                      max: custom_value.custom_field.max_value,
-                                                      step: custom_value.custom_field.steps))
-        edit_tag << view.content_tag(:span, custom_value.value, class: "range_selected_value")
-        edit_tag << view.javascript_tag(
-          <<~JAVASCRIPT
-            $(document).on("input change", "##{tag_id}", function(e) {
-              var value = $(this).val();
-              $(this).next('.range_selected_value').html(value);
-            })
+    field_attributes :steps, :min_value, :max_value
+
+    def edit_tag(view, tag_id, tag_name, custom_value, options = {})
+      edit_tag = view.range_field_tag(tag_name,
+                                      custom_value.value || custom_value.custom_field.default_value,
+                                      options.merge(id: tag_id,
+                                                    min: custom_value.custom_field.min_value,
+                                                    max: custom_value.custom_field.max_value,
+                                                    step: custom_value.custom_field.steps))
+      edit_tag << view.content_tag(:span, custom_value.value, class: "range_selected_value")
+      edit_tag << view.javascript_tag(
+        <<~JAVASCRIPT
+          $(document).on("input change", "##{tag_id}", function(e) {
+            var value = $(this).val();
+            $(this).next('.range_selected_value').html(value);
+          })
         JAVASCRIPT
-        )
-        edit_tag
-      end
+      )
+      edit_tag
+    end
 
-      def cast_single_value(custom_field, value, customized = nil)
-        value.to_i
-      end
+    def cast_single_value(custom_field, value, customized = nil)
+      value.to_i
+    end
 
-      def validate_single_value(custom_field, value, customized = nil)
-        errs = super
-        errs << ::I18n.t('activerecord.errors.messages.not_a_number') unless /^[+-]?\d+$/.match?(value.to_s.strip)
-        errs
-      end
+    def validate_single_value(custom_field, value, customized = nil)
+      errs = super
+      errs << ::I18n.t('activerecord.errors.messages.not_a_number') unless /^[+-]?\d+$/.match?(value.to_s.strip)
+      errs
+    end
 
-      def query_filter_options(custom_field, query)
-        { :type => :integer }
-      end
+    def query_filter_options(custom_field, query)
+      { :type => :integer }
+    end
 
-      def group_statement(custom_field)
-        order_statement(custom_field)
-      end
+    def group_statement(custom_field)
+      order_statement(custom_field)
     end
 
   end
 end
-
-class CustomField < ActiveRecord::Base
-  safe_attributes("steps", "min_value", "max_value")
-end

lib/redmine_tiny_features/hooks.rb

@@ -1,6 +1,6 @@
 module RedmineTinyFeatures
   class Hooks < Redmine::Hook::ViewListener
-    #adds our css on each page
+    # adds our css on each page
     def view_layouts_base_html_head(context)
       stylesheet_link_tag("tiny_features", :plugin => "redmine_tiny_features") +
         javascript_include_tag('redmine_tiny_features.js', plugin: 'redmine_tiny_features')
@@ -14,6 +14,34 @@ def controller_journals_edit_post(context = {})
         end
       end
     end
+  end
 
+  class ModelHook < Redmine::Hook::Listener
+    def after_plugins_loaded(_context = {})
+      require_relative 'custom_field_enumeration_patch'
+      require_relative 'custom_field_patch'
+      require_relative 'field_format_patch'
+      require_relative 'issue_query_patch'
+      require_relative 'issue_patch'
+      require_relative 'issue_status_patch'
+      require_relative 'issue_statuses_helper_patch'
+      require_relative 'issues_helper_patch'
+      require_relative 'issues_controller_patch'
+      require_relative 'journal_patch'
+      require_relative 'mailer_patch'
+      require_relative 'principal_patch'
+      require_relative 'project_query_patch'
+      require_relative 'project_patch'
+      require_relative 'projects_helper_patch'
+      require_relative 'queries_helper_patch'
+      require_relative 'query_patch'
+      require_relative 'queries_controller_patch'
+      require_relative 'roles_controller_patch'
+      require_relative 'tracker_patch'
+      require_relative 'time_entry_query_patch'
+      require_relative 'user_patch'
+      require_relative 'users_helper_patch'
+      require_relative 'user_preference_patch'
+    end
   end
 end

lib/redmine_tiny_features/issue_status_patch.rb

@@ -1,5 +1,9 @@
 require_dependency 'issue_status'
 
+module RedmineTinyFeatures::IssueStatusPatch
+
+end
+
 class IssueStatus < ActiveRecord::Base
   safe_attributes 'color', 'status_ids' #,'suggested_status_ids'
 
@@ -26,4 +30,4 @@ def self.valid_color_list
   def css_classes
     "status-#{color}"
   end
-end
+end

lib/redmine_tiny_features/issue_statuses_helper_patch.rb

@@ -1,12 +1,12 @@
 require_dependency 'issue_statuses_helper'
 
 module RedmineTinyFeatures
-  module IssueStatusesHelper
+  module IssueStatusesHelperPatch
     def valid_color_list
       IssueStatus.valid_color_list.collect {|o| [l(o.last), o.first]}
     end
   end
 end
 
-IssueStatusesHelper.prepend RedmineTinyFeatures::IssueStatusesHelper
-ActionView::Base.send(:include, IssueStatusesHelper)
+IssueStatusesHelper.prepend RedmineTinyFeatures::IssueStatusesHelperPatch
+ActionView::Base.send(:include, IssueStatusesHelper)

lib/redmine_tiny_features/issues_controller_patch.rb

@@ -1,5 +1,9 @@
 require_dependency 'issues_controller'
 
+module RedmineTinyFeatures::IssuesControllerPatch
+
+end
+
 class IssuesController
 
   append_before_action :find_optional_project_for_new_issue, :only => [:new]

lib/redmine_tiny_features/issues_helper_patch.rb

@@ -1,7 +1,7 @@
 require_dependency 'issues_helper'
 
 module RedmineTinyFeatures
-  module IssuesHelper
+  module IssuesHelperPatch
 
     def show_detail(detail, no_html = false, options = {})
       case detail.property
@@ -45,5 +45,5 @@ def actions_dropdown(&block)
   end
 end
 
-IssuesHelper.prepend RedmineTinyFeatures::IssuesHelper
+IssuesHelper.prepend RedmineTinyFeatures::IssuesHelperPatch
 ActionView::Base.prepend IssuesHelper

lib/redmine_tiny_features/journal_patch.rb

@@ -1,7 +1,6 @@
 require_dependency 'journal'
 
-class Journal < ActiveRecord::Base
-
+module RedmineTinyFeatures::JournalPatch
   # Adds a journal detail for a note that was removed
   def journalize_note(journal)
     details <<
@@ -19,3 +18,5 @@ def note_removed(journal)
     end
   end
 end
+
+Journal.prepend RedmineTinyFeatures::JournalPatch

lib/redmine_tiny_features/mailer_patch.rb

@@ -1,5 +1,9 @@
 require_dependency 'mailer'
 
+module RedmineTinyFeatures::MailerPatch
+
+end
+
 class Mailer < ActionMailer::Base
 
   # Sends reminders to issue assignees

lib/redmine_tiny_features/principal_patch.rb

@@ -1,5 +1,9 @@
 require_dependency 'principal'
 
+module RedmineTinyFeatures::PrincipalPatch
+
+end
+
 class Principal < ActiveRecord::Base
 
   # Principals that are members of a collection of projects with pagination

lib/redmine_tiny_features/project_patch.rb

@@ -1,5 +1,9 @@
 require_dependency 'project'
 
+module RedmineTinyFeatures::ProjectPatch
+
+end
+
 class Project < ActiveRecord::Base
 
   has_many :disabled_custom_field_enumerations, :dependent => :delete_all

lib/redmine_tiny_features/project_query_patch.rb

@@ -5,7 +5,7 @@ class ProjectQuery < Query
   self.available_columns << QueryColumn.new(:module_enabled, :sortable => false, :default_order => 'asc')
 end
 
-module PluginRedmineTinyFeatures
+module RedmineTinyFeatures
   module ProjectQueryPatch
 
     def initialize_available_filters
@@ -35,4 +35,4 @@ def sql_for_module_enabled_field(field, operator, value)
   end
 end
 
-ProjectQuery.prepend PluginRedmineTinyFeatures::ProjectQueryPatch
+ProjectQuery.prepend RedmineTinyFeatures::ProjectQueryPatch

lib/redmine_tiny_features/projects_helper_patch.rb

@@ -1,7 +1,7 @@
 require_dependency 'projects_helper'
 
-module PluginRedmineTinyFeatures
-  module ProjectsHelper
+module RedmineTinyFeatures
+  module ProjectsHelperPatch
     def project_settings_tabs
       super.tap do |tabs|
         if User.current.allowed_to?(:manage_project_enumerations, @project)
@@ -17,5 +17,5 @@ def project_settings_tabs
   end
 end
 
-ProjectsHelper.prepend PluginRedmineTinyFeatures::ProjectsHelper
+ProjectsHelper.prepend RedmineTinyFeatures::ProjectsHelperPatch
 ActionView::Base.send(:include, ProjectsHelper)