jro_apps/redmine Commit - r15278:9d9e26317a61

Don't use alias_chain_method....

Jean-Philippe Lang -

r15278:9d9e26317a61

parent child

Context file:

r15278:9d9e26317a61

Collapse all files

config/initializers/10-patches.rb +6 -6

              require 'active_record'
              module ActiveRecord
                class Base
                  include Redmine::I18n
                  # Translate attribute names for validation errors display
                  def self.human_attribute_name(attr, options = {})
                    prepared_attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
                    class_prefix = name.underscore.gsub('/', '_')
                    redmine_default = [
                      :"field_#{class_prefix}_#{prepared_attr}",
                      :"field_#{prepared_attr}"
                    ]
                    options[:default] = redmine_default + Array(options[:default])
                    super
                  end
                end
                # Undefines private Kernel#open method to allow using `open` scopes in models.
                # See Defect #11545 (http://www.redmine.org/issues/11545) for details.
                class Base
                  class << self
                    undef open
                  end
                end
                class Relation ; undef open ; end
              end
              module ActionView
                module Helpers
                  module DateHelper
                    # distance_of_time_in_words breaks when difference is greater than 30 years
                    def distance_of_date_in_words(from_date, to_date = 0, options = {})
                      from_date = from_date.to_date if from_date.respond_to?(:to_date)
                      to_date = to_date.to_date if to_date.respond_to?(:to_date)
                      distance_in_days = (to_date - from_date).abs
                      I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
                        case distance_in_days
                          when 0..60     then locale.t :x_days,             :count => distance_in_days.round
                          when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
                          else                locale.t :over_x_years,       :count => (distance_in_days / 365).floor
                        end
                      end
                    end
                  end
                end
                class Resolver
                  def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
                    cached(key, [name, prefix, partial], details, locals) do
                      if (details[:formats] & [:xml, :json]).any?
                        details = details.dup
                        details[:formats] = details[:formats].dup + [:api]
                      end
                      find_templates(name, prefix, partial, details)
                    end
                  end
                end
              end
              ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
              # HTML5: <option value=""></option> is invalid, use <option value="">&nbsp;</option> instead
              module ActionView
                module Helpers
                  module Tags
                    class Base
                      private
-                     def add_options_with_non_empty_blank_option(option_tags, options, value = nil)
+                     alias :add_options_without_non_empty_blank_option :add_options
+                     def add_options(option_tags, options, value = nil)
                        if options[:include_blank] == true
                          options = options.dup
                          options[:include_blank] = '&nbsp;'.html_safe
                        end
                        add_options_without_non_empty_blank_option(option_tags, options, value)
                      end
-                     alias_method_chain :add_options, :non_empty_blank_option
                    end
                  end
                  module FormTagHelper
-                   def select_tag_with_non_empty_blank_option(name, option_tags = nil, options = {})
+                   alias :select_tag_without_non_empty_blank_option :select_tag
+                   def select_tag(name, option_tags = nil, options = {})
                      if options.delete(:include_blank)
                        options[:prompt] = '&nbsp;'.html_safe
                      end
                      select_tag_without_non_empty_blank_option(name, option_tags, options)
                    end
-                   alias_method_chain :select_tag, :non_empty_blank_option
                  end
                  module FormOptionsHelper
-                   def options_for_select_with_non_empty_blank_option(container, selected = nil)
+                   alias :options_for_select_without_non_empty_blank_option :options_for_select
+                   def options_for_select(container, selected = nil)
                      if container.is_a?(Array)
                        container = container.map {|element| element.blank? ? ["&nbsp;".html_safe, ""] : element}
                      end
                      options_for_select_without_non_empty_blank_option(container, selected)
                    end
-                   alias_method_chain :options_for_select, :non_empty_blank_option
                  end
                end
              end
              require 'mail'
              module DeliveryMethods
                class AsyncSMTP < ::Mail::SMTP
                  def deliver!(*args)
                    Thread.start do
                      super *args
                    end
                  end
                end
                class AsyncSendmail < ::Mail::Sendmail
                  def deliver!(*args)
                    Thread.start do
                      super *args
                    end
                  end
                end
                class TmpFile
                  def initialize(*args); end
                  def deliver!(mail)
                    dest_dir = File.join(Rails.root, 'tmp', 'emails')
                    Dir.mkdir(dest_dir) unless File.directory?(dest_dir)
                    File.open(File.join(dest_dir, mail.message_id.gsub(/[<>]/, '') + '.eml'), 'wb') {|f| f.write(mail.encoded) }
                  end
                end
              end
              ActionMailer::Base.add_delivery_method :async_smtp, DeliveryMethods::AsyncSMTP
              ActionMailer::Base.add_delivery_method :async_sendmail, DeliveryMethods::AsyncSendmail
              ActionMailer::Base.add_delivery_method :tmp_file, DeliveryMethods::TmpFile
              # Changes how sent emails are logged
              # Rails doesn't log cc and bcc which is misleading when using bcc only (#12090)
              module ActionMailer
                class LogSubscriber < ActiveSupport::LogSubscriber
                  def deliver(event)
                    recipients = [:to, :cc, :bcc].inject("") do |s, header|
                      r = Array.wrap(event.payload[header])
                      if r.any?
                        s << "\n  #{header}: #{r.join(', ')}"
                      end
                      s
                    end
                    info("\nSent email \"#{event.payload[:subject]}\" (%1.fms)#{recipients}" % event.duration)
                    debug(event.payload[:mail])
                  end
                end
              end
              # #deliver is deprecated in Rails 4.2
              # Prevents massive deprecation warnings
              module ActionMailer
                class MessageDelivery < Delegator
                  def deliver
                    deliver_now
                  end
                end
              end
              module ActionController
                module MimeResponds
                  class Collector
                    def api(&block)
                      any(:xml, :json, &block)
                    end
                  end
                end
              end
              module ActionController
                class Base
                  # Displays an explicit message instead of a NoMethodError exception
                  # when trying to start Redmine with an old session_store.rb
                  # TODO: remove it in a later version
                  def self.session=(*args)
                    $stderr.puts "Please remove config/initializers/session_store.rb and run `rake generate_secret_token`.\n" +
                      "Setting the session secret with ActionController.session= is no longer supported."
                    exit 1
                  end
                end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages