From bf014a4b2390a40b398a8e85e18fd42763627de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Wed, 3 Apr 2019 13:18:26 +0200 Subject: [PATCH] NameError: uninitialized constant #122 --- app/models/custom_workflow.rb | 11 ++--------- lib/redmine_custom_workflows/patches/project_patch.rb | 6 +----- .../patches/wiki_page_patch.rb | 6 +----- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/app/models/custom_workflow.rb b/app/models/custom_workflow.rb index 3306267..d7b7ad7 100644 --- a/app/models/custom_workflow.rb +++ b/app/models/custom_workflow.rb @@ -34,17 +34,10 @@ class CustomWorkflow < ActiveRecord::Base validates_format_of :author, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true validate :validate_syntax, :validate_scripts_presence, :if => Proc.new {|workflow| workflow.respond_to?(:observable) and workflow.active?} - if Rails::VERSION::MAJOR >= 4 - default_scope { order(:position => :asc) } - projects_join_table = reflect_on_association(:projects).join_table - else - default_scope :order => 'position ASC' - projects_join_table = reflect_on_association(:projects).options[:join_table] - end - + default_scope { order(:position => :asc) } scope :active, lambda { where(:active => true) } scope :for_project, (lambda do |project| - where("is_for_all=? OR EXISTS (SELECT * FROM #{projects_join_table} WHERE project_id=? AND custom_workflow_id=id)", + where("is_for_all=? OR EXISTS (SELECT * FROM #{reflect_on_association(:projects).join_table} WHERE project_id=? AND custom_workflow_id=id)", true, project.id) end) scope :observing, lambda { |observable| where(:observable => observable) } diff --git a/lib/redmine_custom_workflows/patches/project_patch.rb b/lib/redmine_custom_workflows/patches/project_patch.rb index 22948ee..5bca9b2 100644 --- a/lib/redmine_custom_workflows/patches/project_patch.rb +++ b/lib/redmine_custom_workflows/patches/project_patch.rb @@ -43,11 +43,7 @@ module RedmineCustomWorkflows end [:before_add, :before_remove, :after_add, :after_remove].each do |observable| - send("#{observable}_for_attachments") << if Rails::VERSION::MAJOR >= 4 - lambda { |event, project, attachment| Project.attachments_callback(event, project, attachment) } - else - lambda { |project, attachment| Project.attachments_callback(observable, project, attachment) } - end + send("#{observable}_for_attachments") << lambda { |event, project, attachment| Project.attachments_callback(event, project, attachment) } end end end diff --git a/lib/redmine_custom_workflows/patches/wiki_page_patch.rb b/lib/redmine_custom_workflows/patches/wiki_page_patch.rb index 65fcef3..e560dcc 100644 --- a/lib/redmine_custom_workflows/patches/wiki_page_patch.rb +++ b/lib/redmine_custom_workflows/patches/wiki_page_patch.rb @@ -33,11 +33,7 @@ module RedmineCustomWorkflows end [:before_add, :before_remove, :after_add, :after_remove].each do |observable| - send("#{observable}_for_attachments") << if Rails::VERSION::MAJOR >= 4 - lambda { |event, page, attachment| WikiPage.attachments_callback(event, page, attachment) } - else - lambda { |page, attachment| WikiPage.attachments_callback(observable, page, attachment) } - end + send("#{observable}_for_attachments") << lambda { |event, page, attachment| WikiPage.attachments_callback(event, page, attachment) } end end end