From 679a1a7e22710a17071f850f4b57f00abdb58fb8 Mon Sep 17 00:00:00 2001 From: Tilman Klaeger Date: Thu, 26 May 2022 20:01:55 +0200 Subject: [PATCH] Adjusting for Redmine 5 (Rails 6, zeitgeist) --- init.rb | 30 +++++++++++++++--------------- lib/unread_issues/hooks_views.rb | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/init.rb b/init.rb index 7040741..99d42e6 100644 --- a/init.rb +++ b/init.rb @@ -1,10 +1,12 @@ Redmine::Plugin.register :unread_issues do name 'Unread Issues plugin' - author 'Vladimir Pitin, Danil Kukhlevskiy, !Lucky' + author 'Vladimir Pitin, Danil Kukhlevskiy, !Lucky, Tilman19' description 'This is a plugin for Redmine, that marks unread issues' - version '0.0.2' + version '0.0.3' url 'http://rmplus.pro/redmine/plugins/unread_issues' author_url 'http://rmplus.pro' + directory __dir__ + requires_redmine version_or_higher: '4.0' settings partial: 'unread_issues/settings', default: { @@ -25,8 +27,9 @@ menu :top_menu, :ui_my_updated_issues, :ui_my_updated_issues_url, :caption => Proc.new { User.current.ui_my_updated_issues_caption }, after: :ui_my_unread_issues, if: Proc.new { User.current.logged? } end -Rails.application.config.to_prepare do - require 'unread_issues/hooks_views' +def init() + require File.expand_path('lib/unread_issues/hooks_views.rb', __dir__) + unless Issue.included_modules.include?(UnreadIssues::IssuePatch) Issue.send(:include, UnreadIssues::IssuePatch) @@ -49,15 +52,12 @@ #Acl::Settings.append_setting('enable_ajax_counters', :unread_issues) end -Rails.application.config.after_initialize do -# plugins = { a_common_libs: '2.5.4' } - plugins = { } - plugin = Redmine::Plugin.find(:unread_issues) - plugins.each do |k,v| - begin - plugin.requires_redmine_plugin(k, v) - rescue Redmine::PluginNotFound => ex - raise(Redmine::PluginNotFound, "Plugin requires #{k} not found") +if Rails.version > '6.0' + init() + return +else + Rails.configuration.to_prepare do + init() end - end -end \ No newline at end of file +end + diff --git a/lib/unread_issues/hooks_views.rb b/lib/unread_issues/hooks_views.rb index f214c4d..a9f2a40 100644 --- a/lib/unread_issues/hooks_views.rb +++ b/lib/unread_issues/hooks_views.rb @@ -1,8 +1,8 @@ module UnreadIssues - module UnreadIssues + module UnreadIssues::HooksViews class Hooks < Redmine::Hook::ViewListener render_on(:view_layouts_base_html_head, partial: 'hooks/unread_isues/add_css', layout: false) render_on(:view_issues_show_details_bottom, partial: 'hooks/unread_isues/issue_bottom_details', layout: false) end end -end \ No newline at end of file +end