From d441310db40a3a1f26353df98c40f8448f9a57a8 Mon Sep 17 00:00:00 2001 From: "Karel.Picman" Date: Wed, 16 Mar 2022 13:17:06 +0100 Subject: [PATCH 1/5] #652 Rails 6 --- Gemfile | 5 ---- after_init.rb | 2 -- lib/redmine_custom_workflows.rb | 26 +++++++++---------- .../errors/workflow_error.rb | 17 +++++++----- .../{hooks.rb => views/base_view_hooks.rb} | 16 +++++++----- .../patches/attachment_patch.rb | 11 +++++--- .../patches/group_patch.rb | 12 ++++++--- .../patches/issue_patch.rb | 11 +++++--- .../patches/issue_relation_patch.rb | 11 +++++--- .../patches/mailer_patch.rb | 8 ++++-- .../patches/project_patch.rb | 11 +++++--- .../patches/projects_helper_patch.rb | 1 + .../patches/time_entry_patch.rb | 11 +++++--- .../patches/user_patch.rb | 11 +++++--- .../patches/version_patch.rb | 11 +++++--- .../patches/wiki_content_patch.rb | 11 +++++--- .../patches/wiki_page_patch.rb | 11 +++++--- 17 files changed, 112 insertions(+), 74 deletions(-) rename lib/redmine_custom_workflows/hooks/{hooks.rb => views/base_view_hooks.rb} (72%) diff --git a/Gemfile b/Gemfile index 9745bdc..75ce5b8 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,4 @@ source 'https://rubygems.org' do gem 'acts_as_list' gem 'activemodel-serializers-xml' - - # Redmine extensions - unless %w(easyproject easy_gantt).any? { |plugin| Dir.exist?(File.expand_path("../../#{plugin}", __FILE__)) } - gem 'redmine_extensions', '~> 0.3.9' - end end diff --git a/after_init.rb b/after_init.rb index 397868c..2e1f564 100644 --- a/after_init.rb +++ b/after_init.rb @@ -22,8 +22,6 @@ require_dependency File.dirname(__FILE__) + '/lib/redmine_custom_workflows.rb' -ActiveSupport::Dependencies.autoload_paths << File.join(File.dirname(__FILE__), 'app') - def custom_workflows_init # Administration menu extension Redmine::MenuManager.map :admin_menu do |menu| diff --git a/lib/redmine_custom_workflows.rb b/lib/redmine_custom_workflows.rb index 055527a..3c0fd7f 100644 --- a/lib/redmine_custom_workflows.rb +++ b/lib/redmine_custom_workflows.rb @@ -21,20 +21,20 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Hooks -require 'redmine_custom_workflows/hooks/hooks' +require File.dirname(__FILE__) + '/redmine_custom_workflows/hooks/views/base_view_hooks' # Errors -require 'redmine_custom_workflows/errors/workflow_error' +require File.dirname(__FILE__) + '/redmine_custom_workflows/errors/workflow_error' # Patches -require 'redmine_custom_workflows/patches/attachment_patch' -require 'redmine_custom_workflows/patches/group_patch' -require 'redmine_custom_workflows/patches/issue_patch' -require 'redmine_custom_workflows/patches/issue_relation_patch' -require 'redmine_custom_workflows/patches/project_patch' -require 'redmine_custom_workflows/patches/projects_helper_patch' -require 'redmine_custom_workflows/patches/time_entry_patch' -require 'redmine_custom_workflows/patches/user_patch' -require 'redmine_custom_workflows/patches/version_patch' -require 'redmine_custom_workflows/patches/wiki_content_patch' -require 'redmine_custom_workflows/patches/wiki_page_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/attachment_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/group_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/issue_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/issue_relation_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/project_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/projects_helper_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/time_entry_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/user_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/version_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/wiki_content_patch' +require File.dirname(__FILE__) + '/redmine_custom_workflows/patches/wiki_page_patch' diff --git a/lib/redmine_custom_workflows/errors/workflow_error.rb b/lib/redmine_custom_workflows/errors/workflow_error.rb index 7613889..fb6c8f7 100644 --- a/lib/redmine_custom_workflows/errors/workflow_error.rb +++ b/lib/redmine_custom_workflows/errors/workflow_error.rb @@ -20,11 +20,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class WorkflowError < StandardError - attr_accessor :error +module RedmineCustomWorkflows + module Errors - def initialize(message) - @error = message - super message + class WorkflowError < StandardError + attr_accessor :error + + def initialize(message) + @error = message + super message + end + end end -end \ No newline at end of file +end diff --git a/lib/redmine_custom_workflows/hooks/hooks.rb b/lib/redmine_custom_workflows/hooks/views/base_view_hooks.rb similarity index 72% rename from lib/redmine_custom_workflows/hooks/hooks.rb rename to lib/redmine_custom_workflows/hooks/views/base_view_hooks.rb index f9f42ae..69afe6e 100644 --- a/lib/redmine_custom_workflows/hooks/hooks.rb +++ b/lib/redmine_custom_workflows/hooks/views/base_view_hooks.rb @@ -21,14 +21,18 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module RedmineCustomWorkflows + module Hooks + module Views - class Hooks < Redmine::Hook::ViewListener + class BaseViewHooks < Redmine::Hook::ViewListener + + def view_layouts_base_html_head(context={}) + return unless /^(CustomWorkflows|Projects)/.match?(context[:controller].class.name) + "\n".html_safe + stylesheet_link_tag('custom_workflows.css', plugin: :redmine_custom_workflows) + end + + end - def view_layouts_base_html_head(context={}) - return unless /^(CustomWorkflows|Projects)/.match?(context[:controller].class.name) - "\n".html_safe + stylesheet_link_tag('custom_workflows.css', plugin: :redmine_custom_workflows) end - end - end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/attachment_patch.rb b/lib/redmine_custom_workflows/patches/attachment_patch.rb index 60ffdf3..5f89b7f 100644 --- a/lib/redmine_custom_workflows/patches/attachment_patch.rb +++ b/lib/redmine_custom_workflows/patches/attachment_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module AttachmentPatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -60,6 +60,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'Attachment', - 'RedmineCustomWorkflows::Patches::AttachmentPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'Attachment', 'RedmineCustomWorkflows::Patches::AttachmentPatch' +else + Attachment.prepend RedmineCustomWorkflows::Patches::AttachmentPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/group_patch.rb b/lib/redmine_custom_workflows/patches/group_patch.rb index 2874dfe..ec87d33 100644 --- a/lib/redmine_custom_workflows/patches/group_patch.rb +++ b/lib/redmine_custom_workflows/patches/group_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module GroupPatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -74,6 +74,10 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'Group', - 'RedmineCustomWorkflows::Patches::GroupPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'Group', + 'RedmineCustomWorkflows::Patches::GroupPatch' +else + Group.prepend RedmineCustomWorkflows::Patches::GroupPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/issue_patch.rb b/lib/redmine_custom_workflows/patches/issue_patch.rb index 522b4d0..3ff5df4 100644 --- a/lib/redmine_custom_workflows/patches/issue_patch.rb +++ b/lib/redmine_custom_workflows/patches/issue_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module IssuePatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -88,6 +88,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'Issue', - 'RedmineCustomWorkflows::Patches::IssuePatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'Issue', 'RedmineCustomWorkflows::Patches::IssuePatch' +else + Issue.prepend RedmineCustomWorkflows::Patches::IssuePatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/issue_relation_patch.rb b/lib/redmine_custom_workflows/patches/issue_relation_patch.rb index ae90399..1733e17 100644 --- a/lib/redmine_custom_workflows/patches/issue_relation_patch.rb +++ b/lib/redmine_custom_workflows/patches/issue_relation_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module IssueRelationPatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -73,6 +73,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'IssueRelation', - 'RedmineCustomWorkflows::Patches::IssueRelationPatch' +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'IssueRelation', 'RedmineCustomWorkflows::Patches::IssueRelationPatch' +else + IssueRelation.prepend RedmineCustomWorkflows::Patches::IssueRelationPatch +end diff --git a/lib/redmine_custom_workflows/patches/mailer_patch.rb b/lib/redmine_custom_workflows/patches/mailer_patch.rb index 7bdee9d..6dd3e1c 100644 --- a/lib/redmine_custom_workflows/patches/mailer_patch.rb +++ b/lib/redmine_custom_workflows/patches/mailer_patch.rb @@ -51,5 +51,9 @@ module RedmineCustomWorkflows end end -RedmineExtensions::PatchManager.register_model_patch 'Mailer', - 'RedmineCustomWorkflows::Patches::MailerPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'Mailer', 'RedmineCustomWorkflows::Patches::MailerPatch' +else + Mailer.prepend RedmineCustomWorkflows::Patches::MailerPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/project_patch.rb b/lib/redmine_custom_workflows/patches/project_patch.rb index 2083ef6..9052ac8 100644 --- a/lib/redmine_custom_workflows/patches/project_patch.rb +++ b/lib/redmine_custom_workflows/patches/project_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module ProjectPatch - def self.included(base) + def self.prepended(base) base.class_eval do has_and_belongs_to_many :custom_workflows safe_attributes :custom_workflow_ids, if: @@ -75,6 +75,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'Project', - 'RedmineCustomWorkflows::Patches::ProjectPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'Project', 'RedmineCustomWorkflows::Patches::ProjectPatch' +else + Project.prepend RedmineCustomWorkflows::Patches::ProjectPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/projects_helper_patch.rb b/lib/redmine_custom_workflows/patches/projects_helper_patch.rb index 4385c2d..3f1c012 100644 --- a/lib/redmine_custom_workflows/patches/projects_helper_patch.rb +++ b/lib/redmine_custom_workflows/patches/projects_helper_patch.rb @@ -35,6 +35,7 @@ module RedmineCustomWorkflows end end +# Apply the patch if Redmine::Plugin.installed?(:easy_extensions) RedmineExtensions::PatchManager.register_helper_patch 'ProjectsHelper', 'RedmineCustomWorkflows::Patches::ProjectsHelperPatch', prepend: true diff --git a/lib/redmine_custom_workflows/patches/time_entry_patch.rb b/lib/redmine_custom_workflows/patches/time_entry_patch.rb index e688157..b29d1b9 100644 --- a/lib/redmine_custom_workflows/patches/time_entry_patch.rb +++ b/lib/redmine_custom_workflows/patches/time_entry_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module TimeEntryPatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -60,6 +60,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'TimeEntry', - 'RedmineCustomWorkflows::Patches::TimeEntryPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'TimeEntry', 'RedmineCustomWorkflows::Patches::TimeEntryPatch' +else + TimeEntry.prepend RedmineCustomWorkflows::Patches::TimeEntryPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/user_patch.rb b/lib/redmine_custom_workflows/patches/user_patch.rb index 4132c96..824f893 100644 --- a/lib/redmine_custom_workflows/patches/user_patch.rb +++ b/lib/redmine_custom_workflows/patches/user_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module UserPatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -60,6 +60,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'User', - 'RedmineCustomWorkflows::Patches::UserPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'User', 'RedmineCustomWorkflows::Patches::UserPatch' +else + User.prepend RedmineCustomWorkflows::Patches::UserPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/version_patch.rb b/lib/redmine_custom_workflows/patches/version_patch.rb index 3a0b88c..fc7f67d 100644 --- a/lib/redmine_custom_workflows/patches/version_patch.rb +++ b/lib/redmine_custom_workflows/patches/version_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module VersionPatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -60,6 +60,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'Version', -'RedmineCustomWorkflows::Patches::VersionPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'Version', 'RedmineCustomWorkflows::Patches::VersionPatch' +else + Version.prepend RedmineCustomWorkflows::Patches::VersionPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/wiki_content_patch.rb b/lib/redmine_custom_workflows/patches/wiki_content_patch.rb index f21f329..68f5537 100644 --- a/lib/redmine_custom_workflows/patches/wiki_content_patch.rb +++ b/lib/redmine_custom_workflows/patches/wiki_content_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module WikiContentPatch - def self.included(base) + def self.prepended(base) base.class_eval do before_save :before_save_custom_workflows after_save :after_save_custom_workflows @@ -60,6 +60,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'WikiContent', - 'RedmineCustomWorkflows::Patches::WikiContentPatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'WikiContent', 'RedmineCustomWorkflows::Patches::WikiContentPatch' +else + WikiContent.prepend RedmineCustomWorkflows::Patches::WikiContentPatch +end \ No newline at end of file diff --git a/lib/redmine_custom_workflows/patches/wiki_page_patch.rb b/lib/redmine_custom_workflows/patches/wiki_page_patch.rb index 863c330..b076b75 100644 --- a/lib/redmine_custom_workflows/patches/wiki_page_patch.rb +++ b/lib/redmine_custom_workflows/patches/wiki_page_patch.rb @@ -24,7 +24,7 @@ module RedmineCustomWorkflows module Patches module WikiPagePatch - def self.included(base) + def self.prepended(base) base.class_eval do def self.attachments_callback(event, page, attachment) page.instance_variable_set :@page, page @@ -43,6 +43,9 @@ module RedmineCustomWorkflows end end -# Apply patch -RedmineExtensions::PatchManager.register_model_patch 'WikiPage', - 'RedmineCustomWorkflows::Patches::WikiPagePatch' \ No newline at end of file +# Apply the patch +if Redmine::Plugin.installed?(:easy_extensions) + RedmineExtensions::PatchManager.register_model_patch 'WikiPage', 'RedmineCustomWorkflows::Patches::WikiPagePatch' +else + WikiPage.prepend RedmineCustomWorkflows::Patches::WikiPagePatch +end \ No newline at end of file From 56b0015ce063999ca956b43faaa2b7f4bcec932e Mon Sep 17 00:00:00 2001 From: "Karel.Picman" Date: Thu, 17 Mar 2022 07:59:32 +0100 Subject: [PATCH 2/5] Copyright 2021 -> 2022 --- .gitlab-ci.yml | 2 +- Dockerfile | 2 +- Gemfile | 2 +- after_init.rb | 2 +- app/controllers/custom_workflows_controller.rb | 2 +- app/models/custom_workflow.rb | 2 +- app/models/custom_workflow_mailer.rb | 2 +- app/views/custom_workflow_mailer/custom_email.html.erb | 2 +- app/views/custom_workflow_mailer/custom_email.text.erb | 2 +- app/views/custom_workflows/_form.html.erb | 2 +- app/views/custom_workflows/edit.html.erb | 2 +- app/views/custom_workflows/index.html.erb | 2 +- app/views/custom_workflows/new.html.erb | 2 +- app/views/projects/settings/_custom_workflow.html.erb | 2 +- assets/stylesheets/custom_workflows.css | 2 +- config/locales/cs.yml | 2 +- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- config/locales/pt-BR.yml | 2 +- config/locales/ru.yml | 2 +- config/routes.rb | 2 +- db/migrate/20110915084858_create_custom_workflows.rb | 2 +- db/migrate/20120601054047_alter_custom_workflows.rb | 2 +- db/migrate/20120601054557_create_custom_workflows_projects.rb | 2 +- ...20120628060102_change_custom_workflows_description_type.rb | 2 +- .../20120908085222_add_after_save_to_custom_workflows.rb | 2 +- .../20121005085252_add_is_for_all_to_custom_workflows.rb | 2 +- ...20150522134436_make_after_save_and_before_save_nullable.rb | 2 +- db/migrate/20150522134437_set_position_field_nullable.rb | 2 +- ...525083345_add_author_and_timestamps_to_custom_workflows.rb | 2 +- db/migrate/20150526132244_create_example_workflow.rb | 2 +- .../20150526134840_add_active_field_to_custom_workflows.rb | 2 +- ...20150619135811_add_observable_field_to_custom_workflows.rb | 2 +- ...162054_add_additional_script_fields_to_custom_workflows.rb | 2 +- ...120000_add_before_and_after_destroy_to_custom_workflows.rb | 2 +- init.rb | 4 ++-- lib/redmine_custom_workflows.rb | 2 +- lib/redmine_custom_workflows/errors/workflow_error.rb | 2 +- lib/redmine_custom_workflows/hooks/hooks.rb | 2 +- lib/redmine_custom_workflows/patches/attachment_patch.rb | 2 +- lib/redmine_custom_workflows/patches/group_patch.rb | 2 +- lib/redmine_custom_workflows/patches/issue_patch.rb | 2 +- lib/redmine_custom_workflows/patches/issue_relation_patch.rb | 2 +- lib/redmine_custom_workflows/patches/mailer_patch.rb | 2 +- lib/redmine_custom_workflows/patches/project_patch.rb | 2 +- lib/redmine_custom_workflows/patches/projects_helper_patch.rb | 2 +- lib/redmine_custom_workflows/patches/time_entry_patch.rb | 2 +- lib/redmine_custom_workflows/patches/user_patch.rb | 2 +- lib/redmine_custom_workflows/patches/version_patch.rb | 2 +- lib/redmine_custom_workflows/patches/wiki_content_patch.rb | 2 +- lib/redmine_custom_workflows/patches/wiki_page_patch.rb | 2 +- lib/redmine_custom_workflows/test/test_case.rb | 2 +- lib/redmine_custom_workflows/test/unit_test.rb | 2 +- test/ci/ci.sh | 2 +- test/ci/mariadb.yml | 2 +- test/ci/postgres.yml | 2 +- test/ci/sqlite3.yml | 2 +- test/functional/custom_workflows_controller_test.rb | 2 +- test/test_helper.rb | 2 +- test/unit/custom_workflow_mailer_test.rb | 2 +- test/unit/custom_workflow_test.rb | 2 +- test/unit_test.rb | 2 +- 62 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2da62db..55046ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Dockerfile b/Dockerfile index b1d1f09..77e8c1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Gemfile b/Gemfile index 9745bdc..858f47c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/after_init.rb b/after_init.rb index 397868c..cdaa883 100644 --- a/after_init.rb +++ b/after_init.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/custom_workflows_controller.rb b/app/controllers/custom_workflows_controller.rb index 182dfea..5a8ca9e 100644 --- a/app/controllers/custom_workflows_controller.rb +++ b/app/controllers/custom_workflows_controller.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/custom_workflow.rb b/app/models/custom_workflow.rb index 8ea56e3..600e43f 100644 --- a/app/models/custom_workflow.rb +++ b/app/models/custom_workflow.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/custom_workflow_mailer.rb b/app/models/custom_workflow_mailer.rb index d1a884e..ac5f4cb 100644 --- a/app/models/custom_workflow_mailer.rb +++ b/app/models/custom_workflow_mailer.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/custom_workflow_mailer/custom_email.html.erb b/app/views/custom_workflow_mailer/custom_email.html.erb index 459a188..d3aee00 100644 --- a/app/views/custom_workflow_mailer/custom_email.html.erb +++ b/app/views/custom_workflow_mailer/custom_email.html.erb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov - # Copyright © 2019-21 Karel Pičman + # Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/custom_workflow_mailer/custom_email.text.erb b/app/views/custom_workflow_mailer/custom_email.text.erb index 309abba..555df8a 100644 --- a/app/views/custom_workflow_mailer/custom_email.text.erb +++ b/app/views/custom_workflow_mailer/custom_email.text.erb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov - # Copyright © 2019-21 Karel Pičman + # Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/custom_workflows/_form.html.erb b/app/views/custom_workflows/_form.html.erb index 2e1e2a7..ed3460f 100644 --- a/app/views/custom_workflows/_form.html.erb +++ b/app/views/custom_workflows/_form.html.erb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov - # Copyright © 2019-21 Karel Pičman + # Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/custom_workflows/edit.html.erb b/app/views/custom_workflows/edit.html.erb index 9253c2e..cca77a7 100644 --- a/app/views/custom_workflows/edit.html.erb +++ b/app/views/custom_workflows/edit.html.erb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov - # Copyright © 2019-21 Karel Pičman + # Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/custom_workflows/index.html.erb b/app/views/custom_workflows/index.html.erb index 4dfc8e3..8566877 100644 --- a/app/views/custom_workflows/index.html.erb +++ b/app/views/custom_workflows/index.html.erb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov - # Copyright © 2019-21 Karel Pičman + # Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/custom_workflows/new.html.erb b/app/views/custom_workflows/new.html.erb index 540e31f..cbc19ba 100644 --- a/app/views/custom_workflows/new.html.erb +++ b/app/views/custom_workflows/new.html.erb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov - # Copyright © 2019-21 Karel Pičman + # Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/projects/settings/_custom_workflow.html.erb b/app/views/projects/settings/_custom_workflow.html.erb index 605bc60..93ea711 100644 --- a/app/views/projects/settings/_custom_workflow.html.erb +++ b/app/views/projects/settings/_custom_workflow.html.erb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov - # Copyright © 2019-21 Karel Pičman + # Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/assets/stylesheets/custom_workflows.css b/assets/stylesheets/custom_workflows.css index fedf3fa..3f30507 100644 --- a/assets/stylesheets/custom_workflows.css +++ b/assets/stylesheets/custom_workflows.css @@ -2,7 +2,7 @@ * Redmine plugin for Document Management System "Features" * * Copyright © 2015-19 Anton Argirov -* Copyright © 2019-21 Karel Pičman +* Copyright © 2019-22 Karel Pičman * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f49371a..1453811 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/locales/en.yml b/config/locales/en.yml index 77143ad..fa31db1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/locales/es.yml b/config/locales/es.yml index b58566c..5f2e122 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index fbae585..055eba4 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/locales/ru.yml b/config/locales/ru.yml index b1e88c0..5807965 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/routes.rb b/config/routes.rb index 76f4e0f..51180f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110915084858_create_custom_workflows.rb b/db/migrate/20110915084858_create_custom_workflows.rb index 5b7cd1c..1dadaa5 100644 --- a/db/migrate/20110915084858_create_custom_workflows.rb +++ b/db/migrate/20110915084858_create_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20120601054047_alter_custom_workflows.rb b/db/migrate/20120601054047_alter_custom_workflows.rb index 7a9b5bc..75e289c 100644 --- a/db/migrate/20120601054047_alter_custom_workflows.rb +++ b/db/migrate/20120601054047_alter_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20120601054557_create_custom_workflows_projects.rb b/db/migrate/20120601054557_create_custom_workflows_projects.rb index c80cab5..2b65d5a 100644 --- a/db/migrate/20120601054557_create_custom_workflows_projects.rb +++ b/db/migrate/20120601054557_create_custom_workflows_projects.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20120628060102_change_custom_workflows_description_type.rb b/db/migrate/20120628060102_change_custom_workflows_description_type.rb index 230d5f2..09355c7 100644 --- a/db/migrate/20120628060102_change_custom_workflows_description_type.rb +++ b/db/migrate/20120628060102_change_custom_workflows_description_type.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb b/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb index dc62921..075c10e 100644 --- a/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb +++ b/db/migrate/20120908085222_add_after_save_to_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb b/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb index de213dc..80f4cb8 100644 --- a/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb +++ b/db/migrate/20121005085252_add_is_for_all_to_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb b/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb index 99980f7..9c80789 100644 --- a/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb +++ b/db/migrate/20150522134436_make_after_save_and_before_save_nullable.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20150522134437_set_position_field_nullable.rb b/db/migrate/20150522134437_set_position_field_nullable.rb index aa94fb8..f4c11bc 100644 --- a/db/migrate/20150522134437_set_position_field_nullable.rb +++ b/db/migrate/20150522134437_set_position_field_nullable.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb b/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb index e594f7f..77f6f66 100644 --- a/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb +++ b/db/migrate/20150525083345_add_author_and_timestamps_to_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20150526132244_create_example_workflow.rb b/db/migrate/20150526132244_create_example_workflow.rb index 034a641..817facb 100644 --- a/db/migrate/20150526132244_create_example_workflow.rb +++ b/db/migrate/20150526132244_create_example_workflow.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb b/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb index a12336c..ff16852 100644 --- a/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb +++ b/db/migrate/20150526134840_add_active_field_to_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb b/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb index ab89570..b58ddda 100644 --- a/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb +++ b/db/migrate/20150619135811_add_observable_field_to_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb b/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb index d3743fa..247190a 100644 --- a/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb +++ b/db/migrate/20150619162054_add_additional_script_fields_to_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb b/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb index 1da138a..9964296 100644 --- a/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb +++ b/db/migrate/20151122120000_add_before_and_after_destroy_to_custom_workflows.rb @@ -3,7 +3,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/init.rb b/init.rb index b2a8f39..36b5a3e 100644 --- a/init.rb +++ b/init.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -32,7 +32,7 @@ Redmine::Plugin.register :redmine_custom_workflows do end author 'Anton Argirov/Karel Pičman' description 'It allows to create custom workflows for objects, defined in a plain Ruby language' - version '1.0.7' + version '1.0.8 devel' requires_redmine version_or_higher: '4.1.0' diff --git a/lib/redmine_custom_workflows.rb b/lib/redmine_custom_workflows.rb index 055527a..d450f5a 100644 --- a/lib/redmine_custom_workflows.rb +++ b/lib/redmine_custom_workflows.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/errors/workflow_error.rb b/lib/redmine_custom_workflows/errors/workflow_error.rb index 7613889..89f547e 100644 --- a/lib/redmine_custom_workflows/errors/workflow_error.rb +++ b/lib/redmine_custom_workflows/errors/workflow_error.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/hooks/hooks.rb b/lib/redmine_custom_workflows/hooks/hooks.rb index f9f42ae..11c17c5 100644 --- a/lib/redmine_custom_workflows/hooks/hooks.rb +++ b/lib/redmine_custom_workflows/hooks/hooks.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/attachment_patch.rb b/lib/redmine_custom_workflows/patches/attachment_patch.rb index 60ffdf3..a5f9a24 100644 --- a/lib/redmine_custom_workflows/patches/attachment_patch.rb +++ b/lib/redmine_custom_workflows/patches/attachment_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/group_patch.rb b/lib/redmine_custom_workflows/patches/group_patch.rb index 2874dfe..0f26834 100644 --- a/lib/redmine_custom_workflows/patches/group_patch.rb +++ b/lib/redmine_custom_workflows/patches/group_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/issue_patch.rb b/lib/redmine_custom_workflows/patches/issue_patch.rb index 522b4d0..03dfc12 100644 --- a/lib/redmine_custom_workflows/patches/issue_patch.rb +++ b/lib/redmine_custom_workflows/patches/issue_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/issue_relation_patch.rb b/lib/redmine_custom_workflows/patches/issue_relation_patch.rb index ae90399..4597e4d 100644 --- a/lib/redmine_custom_workflows/patches/issue_relation_patch.rb +++ b/lib/redmine_custom_workflows/patches/issue_relation_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/mailer_patch.rb b/lib/redmine_custom_workflows/patches/mailer_patch.rb index 7bdee9d..ae8a4b8 100644 --- a/lib/redmine_custom_workflows/patches/mailer_patch.rb +++ b/lib/redmine_custom_workflows/patches/mailer_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/project_patch.rb b/lib/redmine_custom_workflows/patches/project_patch.rb index 2083ef6..72d0110 100644 --- a/lib/redmine_custom_workflows/patches/project_patch.rb +++ b/lib/redmine_custom_workflows/patches/project_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/projects_helper_patch.rb b/lib/redmine_custom_workflows/patches/projects_helper_patch.rb index 4385c2d..0d9efed 100644 --- a/lib/redmine_custom_workflows/patches/projects_helper_patch.rb +++ b/lib/redmine_custom_workflows/patches/projects_helper_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/time_entry_patch.rb b/lib/redmine_custom_workflows/patches/time_entry_patch.rb index e688157..8646fa8 100644 --- a/lib/redmine_custom_workflows/patches/time_entry_patch.rb +++ b/lib/redmine_custom_workflows/patches/time_entry_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/user_patch.rb b/lib/redmine_custom_workflows/patches/user_patch.rb index 4132c96..46f6e53 100644 --- a/lib/redmine_custom_workflows/patches/user_patch.rb +++ b/lib/redmine_custom_workflows/patches/user_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/version_patch.rb b/lib/redmine_custom_workflows/patches/version_patch.rb index 3a0b88c..4159a20 100644 --- a/lib/redmine_custom_workflows/patches/version_patch.rb +++ b/lib/redmine_custom_workflows/patches/version_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/wiki_content_patch.rb b/lib/redmine_custom_workflows/patches/wiki_content_patch.rb index f21f329..436727b 100644 --- a/lib/redmine_custom_workflows/patches/wiki_content_patch.rb +++ b/lib/redmine_custom_workflows/patches/wiki_content_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/patches/wiki_page_patch.rb b/lib/redmine_custom_workflows/patches/wiki_page_patch.rb index 863c330..d43065d 100644 --- a/lib/redmine_custom_workflows/patches/wiki_page_patch.rb +++ b/lib/redmine_custom_workflows/patches/wiki_page_patch.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/test/test_case.rb b/lib/redmine_custom_workflows/test/test_case.rb index 37a70c7..f3f1b4a 100644 --- a/lib/redmine_custom_workflows/test/test_case.rb +++ b/lib/redmine_custom_workflows/test/test_case.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_custom_workflows/test/unit_test.rb b/lib/redmine_custom_workflows/test/unit_test.rb index 729602f..af87d8f 100644 --- a/lib/redmine_custom_workflows/test/unit_test.rb +++ b/lib/redmine_custom_workflows/test/unit_test.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/ci/ci.sh b/test/ci/ci.sh index 68b5047..00f9abf 100644 --- a/test/ci/ci.sh +++ b/test/ci/ci.sh @@ -2,7 +2,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/ci/mariadb.yml b/test/ci/mariadb.yml index ed92efd..ae02506 100644 --- a/test/ci/mariadb.yml +++ b/test/ci/mariadb.yml @@ -1,7 +1,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/ci/postgres.yml b/test/ci/postgres.yml index d4739f9..e07ba3c 100644 --- a/test/ci/postgres.yml +++ b/test/ci/postgres.yml @@ -1,7 +1,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/ci/sqlite3.yml b/test/ci/sqlite3.yml index 8dce453..02592a2 100644 --- a/test/ci/sqlite3.yml +++ b/test/ci/sqlite3.yml @@ -1,7 +1,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/custom_workflows_controller_test.rb b/test/functional/custom_workflows_controller_test.rb index 0163d48..428ffa9 100644 --- a/test/functional/custom_workflows_controller_test.rb +++ b/test/functional/custom_workflows_controller_test.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/test_helper.rb b/test/test_helper.rb index e9c4967..3ccd763 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/custom_workflow_mailer_test.rb b/test/unit/custom_workflow_mailer_test.rb index 9b4415a..9fe3a31 100644 --- a/test/unit/custom_workflow_mailer_test.rb +++ b/test/unit/custom_workflow_mailer_test.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/custom_workflow_test.rb b/test/unit/custom_workflow_test.rb index 99a0b47..c5e3466 100644 --- a/test/unit/custom_workflow_test.rb +++ b/test/unit/custom_workflow_test.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit_test.rb b/test/unit_test.rb index 7f38d3e..dd93824 100644 --- a/test/unit_test.rb +++ b/test/unit_test.rb @@ -4,7 +4,7 @@ # Redmine plugin for Custom Workflows # # Copyright © 2015-19 Anton Argirov -# Copyright © 2019-21 Karel Pičman +# Copyright © 2019-22 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License From ace9a23dcd544642e105aa3cb13b3a6bae95cca9 Mon Sep 17 00:00:00 2001 From: "Karel.Picman" Date: Thu, 17 Mar 2022 08:20:56 +0100 Subject: [PATCH 3/5] Redmine 4.2.3 doesn't start after installing custom workflow plugin #248 --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index ad63139..9d6a9ae 100644 --- a/Gemfile +++ b/Gemfile @@ -21,5 +21,4 @@ source 'https://rubygems.org' do gem 'acts_as_list' - gem 'activemodel-serializers-xml' end From b9e5aa0fe773213668537d5fcb80529a32595a2d Mon Sep 17 00:00:00 2001 From: "Karel.Picman" Date: Mon, 25 Apr 2022 14:49:46 +0200 Subject: [PATCH 4/5] Russian localisation dropped #StayWithUkraine --- CHANGELOG.md | 5 ++ README.md | 2 +- config/locales/ru.yml | 123 ------------------------------------------ init.rb | 2 +- 4 files changed, 7 insertions(+), 125 deletions(-) delete mode 100644 config/locales/ru.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index cb0234c..9d24ddc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog for Custom Workflows ============================== +2.0.0 *????-??-??* +------------------ + + Redmine 5.0 + 1.0.7 *2021-10-20* ------------------ diff --git a/README.md b/README.md index 14db628..0cf0205 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Custom Workflows plug-in ======================== -The current version of Redmine CustomWorkflows is **1.0.8 devel** +The current version of Redmine CustomWorkflows is **2.0.0** [![pipeline status](https://gitlab.kontron.com/redmine-plugins/redmine_custom_workflows/badges/devel-1.0.8/pipeline.svg)](https://gitlab.kontron.com/redmine-plugins/redmine_custom_workflows/-/commits/devel-1.0.8) diff --git a/config/locales/ru.yml b/config/locales/ru.yml deleted file mode 100644 index 5807965..0000000 --- a/config/locales/ru.yml +++ /dev/null @@ -1,123 +0,0 @@ -# encoding: utf-8 -# -# Redmine plugin for Custom Workflows -# -# Copyright © 2015-19 Anton Argirov -# Copyright © 2019-22 Karel Pičman -# -# This program 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 2 -# of the License, or (at your option) any later version. -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -ru: - project_module_custom_workflows_module: Пользовательские рабочие процессы - permission_manage_project_workflow: Управление пользовательскими рабочими процессами в проекте - - label_custom_workflow: Пользовательский рабочий процесс - label_custom_workflow_plural: Пользовательские рабочие процессы - label_custom_workflow_new: Новый процесс - label_workflow_scripts: Сценарии - label_custom_workflow_export: Экспорт - label_custom_workflow_import: Импорт процесса - label_save_workflows: Сохранение наблюдаемых объектов - label_destroy_workflows: Уничтожение наблюдаемых объектов - label_add_workflows: Добавление наблюдаемых объектов в коллекцию - label_remove_workflows: Удаление наблюдаемых объектов из коллекции - - button_custom_workflow_deactivate: Деактивировать - - field_after_save: Сценарий выполняемый после сохранения наблюдаемого объекта - field_before_save: Сценарий выполняемый перед сохранением наблюдаемого объекта - field_after_destroy: Сценарий выполняемый после уничтожения наблюдаемого объекта - field_before_destroy: Сценарий выполняемый перед уничтожением наблюдаемого объекта - field_after_add: Сценарий выполняемый после добавления наблюдаемого объекта в коллекцию - field_before_add: Сценарий выполняемый перед добавлением наблюдаемого объекта в коллекцию - field_after_remove: Сценарий выполняемый после удаления наблюдаемого объекта из коллекции - field_before_remove: Сценарий выполняемый перед удалением наблюдаемого объекта из коллекции - field_shared_code: Общий код - field_observable: Наблюдаемый объект - field_enabled_for_all_projects: Разрешен для всех проектов - field_custom_workflow_author: E-Mail адрес автора - field_custom_workflow_file: Выберите XML файл ранее экспортированного процесса - field_custom_workflow: - script: Сценарий - - notice_successful_import: Рабочий процесс успешно импортирован - notice_successful_status_change: Статус успешно изменен - error_failed_import: Ошибка импорта рабочего процесса (неверный формат? смотри журнал) - - activerecord: - errors: - messages: - invalid_script: "содержит ошибку: %{error}" - custom_workflow_error: Ошибка в сценарии рабочего процесса (Обратитесь к администратору) - new_status_invalid: "- переход от '%{old_status}' к '%{new_status}' невозможен" - scripts_absent: Хотя бы один скрипт должен быть определен - - text_select_project_custom_workflows: Выберите процессы для данного проекта - text_custom_workflow_before_save_note: Здесь вы можете изменять свойства задачи. Не создавайте и не обновляйте - связанные задачи в этом сценарии. Чтобы завершить сценарий с произвольной ошибкой, используйте `raise WorkflowError, 'Message to user'`. - text_custom_workflow_after_save_note: Вы можете обновлять и создавать задачи (в том числе и связанные задачи) здесь. - Обратите внимание, что данный сценарий будет также выполняться и для вновь создаваемых задач. Поэтому используйте - дополнительные проверки, чтобы избежать бесконечной рекурсии. - text_custom_workflow_issue_code_note: Эти сценарии исполняются в контексте задачи, как и обычные обратные вызовы - before_save и after_save. Поэтому используйте методы и свойства задачи (Issue) напрямую или через ключевое слово - self. - text_custom_workflow_issue_relation_code_note: Scripts are executed in the context of IssueRelation object like ordinary - before_save and after_save callbacks. So use methods and properties of the issue relation directly (or through `self`). - Instance variables (@variable) are also allowed and may be used if needed. - text_custom_workflow_shared_code_note: Этот код будет исполняться перед любым другим процессом и может содержать общий - код, например, функции и классы, необходимые для работы других процессов. - text_custom_workflow_user_code_note: Эти сценарии исполняются в контексте объекта пользователя когда объект - пользователя изменяется (удаляется). Используйте методы и свойства объекта пользователя (User) напрямую или через ключевое слово `self`. - text_custom_workflow_group_code_note: Эти сценарии исполняются в контексте объекта группы когда объект группы - изменяется (удаляется). Используйте методы и свойства объекта группы (Group) напрямую или через ключевое слово `self`. - text_custom_workflow_group_users_code_note: Эти сценарии выполняются когда пользователь добавляется в группу/удаляется - из группы. Используйте переменные @user и @group для доступа к соответствующим объектам из Ваших сценариев. - text_custom_workflow_attachment_code_note: Эти сценарии исполняются в контексте объекта вложения когда объект вложения - изменяется (удаляется). Используйте методы и свойства объекта вложения (Attachment) напрямую или через ключевое - слово self. Обратите внимание на то, что данные сценарии выполняются при сохранении (удалении) вложения любого типа - (задача, документ, страница Wiki и т.д.), поэтому следует дополнительно проверять в коде поле container_type либо в качестве наблюдаемого объекта выбрать конкретный тип вложения. - text_custom_workflow_issue_attachments_code_note: Эти сценарии выполняются когда вложение прикладывается - к задаче/удаляется из задачи. Используйте переменные @issue и @attachment для доступа к соответствующим объектам из Ваших сценариев. - text_custom_workflow_project_code_note: Эти сценарии исполняются в контексте объекта проекта когда объект проекта - изменяется (удаляется). Используйте методы и свойства объекта группы (Project) напрямую или через ключевое слово `self`. - text_custom_workflow_project_attachments_code_note: Эти сценарии выполняются когда файл загружается в проект/удаляется - из проекта. Используйте переменные @project и @attachment для доступа к соответствующим объектам из Ваших сценариев. - text_custom_workflow_wiki_content_code_note: Эти сценарии исполняются в контексте объекта Wiki содержания когда объект - Wiki содержания изменяется (удаляется). Используйте методы и свойства объекта содержания Wiki (WikiContent) напрямую или через ключевое слово self. - text_custom_workflow_wiki_page_attachments_code_note: Эти сценарии выполняются когда файл загружается на Wiki - страницу/удаляется с Wiki страницы. Используйте переменные @page и @attachment для доступа к соответствующим объектам из Ваших сценариев. - text_custom_workflow_time_entry_code_note: Эти сценарии исполняются в контексте объекта затраченного времени когда - объект изменяется (удаляется). Используйте методы и свойства объекта затраченного времени (TimeEntry) напрямую или через ключевое слово self. - text_custom_workflow_version_code_note: Эти сценарии исполняются в контексте объекта версии когда объект изменяется - (удаляется). Используйте методы и свойства объекта версии (Version) напрямую или через ключевое слово `self`. - - text_no_enabled_projects: Нет проектов - text_custom_workflow_author: Будет использован в XML файле при экспорте - text_custom_workflow_disabled: отключен администратором - text_custom_workflow_is_for_all: разрешен для всех проектов - - custom_workflow_observable_shared: <общий код> - custom_workflow_observable_issue: Задача - custom_workflow_observable_issue_attachments: Вложения задач - custom_workflow_observable_group: Группа - custom_workflow_observable_user: Пользователь - custom_workflow_observable_attachment: Вложение - custom_workflow_observable_project: Проект - custom_workflow_observable_project_attachments: Вложения проекта / Файлы - custom_workflow_observable_wiki_content: Содержание Wiki - custom_workflow_observable_wiki_page_attachments: Вложения страниц Wiki - custom_workflow_observable_group_users: Пользователи группы - custom_workflow_observable_time_entry: Затраченное время - custom_workflow_observable_version: Версия diff --git a/init.rb b/init.rb index 36b5a3e..9658492 100644 --- a/init.rb +++ b/init.rb @@ -32,7 +32,7 @@ Redmine::Plugin.register :redmine_custom_workflows do end author 'Anton Argirov/Karel Pičman' description 'It allows to create custom workflows for objects, defined in a plain Ruby language' - version '1.0.8 devel' + version '2.0.0' requires_redmine version_or_higher: '4.1.0' From f68aebd49a7fcb75e16b03fbf4e21888b6d6ecab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Thu, 28 Apr 2022 12:49:04 +0200 Subject: [PATCH 5/5] v2.0.0 released --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d24ddc..4359044 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ Changelog for Custom Workflows ============================== -2.0.0 *????-??-??* +2.0.0 *2022-04-27* ------------------ Redmine 5.0 +* New: #255 - Can you update it to Redmine 5.0.0 +* New: #252 - Rails 6 +* Bug: #248 - Redmine 4.2.3 doesn't start after installing custom workflow plugin +* New: #239 - Gitlab CI enhancement + + 1.0.7 *2021-10-20* ------------------