Removal of unnnecessary files

2026-01-25 15:54:19 +00:00 · 2025-07-01 13:55:13 +02:00 · 2025-07-01 13:55:13 +02:00 · 9ff21d929b
commit 9ff21d929b
parent e7dc9b7ba8
25 changed files with 23 additions and 120 deletions
--- a/.github/workflows/rubyonrails.yml
+++ b/.github/workflows/rubyonrails.yml
@ -20,9 +20,9 @@
 name: "GitHub CI"
 on:
  push:
-    branches: ["devel"]
+    branches: ["cleanup"]
  pull_request:
-    branches: ["devel"]
+    branches: ["cleanup"]
 jobs:
  plugin_tests:
    strategy:
--- a/after_init.rb
+++ b/after_init.rb
@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-# Redmine plugin for Custom Workflows
-#
-# Anton Argirov, Karel Pičman <karel.picman@kontron.com>
-#
-# This file is part of Redmine OAuth plugin.
-#
-# Redmine Custom Workflows plugin is free software: you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your
-#  option) any later version.
-#
-# Redmine Custom Workflows plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along with Redmine Custom Workflows plugin. If not,
-# see <https://www.gnu.org/licenses/>.
-
-require 'redmine'
-require "#{File.dirname(__FILE__)}/lib/redmine_custom_workflows"
-
-def custom_workflows_init
-  # Administration menu extension
-  Redmine::MenuManager.map :admin_menu do |menu|
-    menu.push :custom_workflows, { controller: 'custom_workflows', action: 'index' },
-              caption: :label_custom_workflow_plural, icon: 'workflows',
-              html: { class: 'icon icon-workflows workflows' }
-  end
-end
-
-if Redmine::Plugin.installed?('easy_extensions')
-  ActiveSupport.on_load(:easyproject, yield: true) do
-    custom_workflows_init
-  end
-else
-  custom_workflows_init
-end
--- a/init.rb
+++ b/init.rb
@ -17,6 +17,9 @@
 # You should have received a copy of the GNU General Public License along with Redmine Custom Workflows plugin. If not,
 # see <https://www.gnu.org/licenses/>.

+require 'redmine'
+require "#{File.dirname(__FILE__)}/lib/redmine_custom_workflows"
+
 Redmine::Plugin.register :redmine_custom_workflows do
  name 'Redmine Custom Workflow plugin'
  url 'https://www.redmine.org/plugins/redmine_custom_workflows'
@ -30,4 +33,9 @@ Redmine::Plugin.register :redmine_custom_workflows do
  permission :manage_project_workflow, {}, require: :member
 end

-require_relative 'after_init' unless Redmine::Plugin.installed?('easy_extensions')
+# Administration menu extension
+Redmine::MenuManager.map :admin_menu do |menu|
+  menu.push :custom_workflows, { controller: 'custom_workflows', action: 'index' },
+            caption: :label_custom_workflow_plural, icon: 'workflows',
+            html: { class: 'icon icon-workflows workflows' }
+end
--- a/lib/redmine_custom_workflows/patches/controllers/attachments_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/attachments_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module AttachmentsControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/groups_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/groups_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module GroupsControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/issue_relations_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/issue_relations_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module IssueRelationsControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/issues_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/issues_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module IssuesControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/members_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/members_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module MembersControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/projects_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/projects_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module ProjectsControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/timelog_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/timelog_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module TimelogControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/users_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/users_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module UsersControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/versions_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/versions_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module VersionsControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/controllers/wiki_controller_patch.rb
+++ b/lib/redmine_custom_workflows/patches/controllers/wiki_controller_patch.rb
@ -24,7 +24,6 @@ module RedmineCustomWorkflows
      module WikiControllerPatch
        ################################################################################################################
        # New methods
-        #

        def self.prepended(base)
          base.class_eval do
--- a/lib/redmine_custom_workflows/patches/helpers/projects_helper_patch.rb
+++ b/lib/redmine_custom_workflows/patches/helpers/projects_helper_patch.rb
@ -40,10 +40,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper',
-                                                        'RedmineCustomWorkflows::Patches::Helpers::ProjectsHelperPatch',
-                                                        prepend: true
-else
-  ProjectsController.send :helper, RedmineCustomWorkflows::Patches::Helpers::ProjectsHelperPatch
-end
+ProjectsController.send :helper, RedmineCustomWorkflows::Patches::Helpers::ProjectsHelperPatch
--- a/lib/redmine_custom_workflows/patches/models/attachment_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/attachment_patch.rb
@ -69,9 +69,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'Attachment',
-                                                       'RedmineCustomWorkflows::Patches::Models::AttachmentPatch'
-else
-  Attachment.prepend RedmineCustomWorkflows::Patches::Models::AttachmentPatch
-end
+Attachment.prepend RedmineCustomWorkflows::Patches::Models::AttachmentPatch
--- a/lib/redmine_custom_workflows/patches/models/group_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/group_patch.rb
@ -89,8 +89,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'Group', 'RedmineCustomWorkflows::Patches::Models::GroupPatch'
-else
-  Group.prepend RedmineCustomWorkflows::Patches::Models::GroupPatch
-end
+Group.prepend RedmineCustomWorkflows::Patches::Models::GroupPatch
--- a/lib/redmine_custom_workflows/patches/models/issue_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/issue_patch.rb
@ -103,8 +103,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'Issue', 'RedmineCustomWorkflows::Patches::Models::IssuePatch'
-else
-  Issue.prepend RedmineCustomWorkflows::Patches::Models::IssuePatch
-end
+Issue.prepend RedmineCustomWorkflows::Patches::Models::IssuePatch
--- a/lib/redmine_custom_workflows/patches/models/issue_relation_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/issue_relation_patch.rb
@ -87,9 +87,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'IssueRelation',
-                                                       'RedmineCustomWorkflows::Patches::Models::IssueRelationPatch'
-else
-  IssueRelation.prepend RedmineCustomWorkflows::Patches::Models::IssueRelationPatch
-end
+IssueRelation.prepend RedmineCustomWorkflows::Patches::Models::IssueRelationPatch
--- a/lib/redmine_custom_workflows/patches/models/member_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/member_patch.rb
@ -69,8 +69,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'Member', 'RedmineCustomWorkflows::Patches::Models::MemberPatch'
-else
-  Member.prepend RedmineCustomWorkflows::Patches::Models::MemberPatch
-end
+Member.prepend RedmineCustomWorkflows::Patches::Models::MemberPatch
--- a/lib/redmine_custom_workflows/patches/models/project_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/project_patch.rb
@ -97,9 +97,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'Project',
-                                                       'RedmineCustomWorkflows::Patches::Models::ProjectPatch'
-else
-  Project.prepend RedmineCustomWorkflows::Patches::Models::ProjectPatch
-end
+Project.prepend RedmineCustomWorkflows::Patches::Models::ProjectPatch
--- a/lib/redmine_custom_workflows/patches/models/time_entry_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/time_entry_patch.rb
@ -69,9 +69,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'TimeEntry',
-                                                       'RedmineCustomWorkflows::Patches::Models::TimeEntryPatch'
-else
-  TimeEntry.prepend RedmineCustomWorkflows::Patches::Models::TimeEntryPatch
-end
+TimeEntry.prepend RedmineCustomWorkflows::Patches::Models::TimeEntryPatch
--- a/lib/redmine_custom_workflows/patches/models/user_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/user_patch.rb
@ -69,8 +69,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'User', 'RedmineCustomWorkflows::Patches::Models::UserPatch'
-else
-  User.prepend RedmineCustomWorkflows::Patches::Models::UserPatch
-end
+User.prepend RedmineCustomWorkflows::Patches::Models::UserPatch
--- a/lib/redmine_custom_workflows/patches/models/version_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/version_patch.rb
@ -69,9 +69,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'Version',
-                                                       'RedmineCustomWorkflows::Patches::Models::VersionPatch'
-else
-  Version.prepend RedmineCustomWorkflows::Patches::Models::VersionPatch
-end
+Version.prepend RedmineCustomWorkflows::Patches::Models::VersionPatch
--- a/lib/redmine_custom_workflows/patches/models/wiki_content_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/wiki_content_patch.rb
@ -69,9 +69,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'WikiContent',
-                                                       'RedmineCustomWorkflows::Patches::Models::WikiContentPatch'
-else
-  WikiContent.prepend RedmineCustomWorkflows::Patches::Models::WikiContentPatch
-end
+WikiContent.prepend RedmineCustomWorkflows::Patches::Models::WikiContentPatch
--- a/lib/redmine_custom_workflows/patches/models/wiki_page_patch.rb
+++ b/lib/redmine_custom_workflows/patches/models/wiki_page_patch.rb
@ -58,9 +58,4 @@ module RedmineCustomWorkflows
 end

 # Apply the patch
-if Redmine::Plugin.installed?('easy_extensions')
-  RedmineExtensions::PatchManager.register_model_patch 'WikiPage',
-                                                       'RedmineCustomWorkflows::Patches::Models::WikiPagePatch'
-else
-  WikiPage.prepend RedmineCustomWorkflows::Patches::Models::WikiPagePatch
-end
+WikiPage.prepend RedmineCustomWorkflows::Patches::Models::WikiPagePatch