10-patches.rb
103 lines
| 3.1 KiB
| text/x-ruby
|
RubyLexer
|
r3121 | require 'active_record' | ||
|
r2430 | |||
module ActiveRecord | ||||
class Base | ||||
include Redmine::I18n | ||||
# Translate attribute names for validation errors display | ||||
|
r8166 | def self.human_attribute_name(attr, *args) | ||
|
r6006 | l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr) | ||
|
r2430 | end | ||
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 | ||||
|
r2902 | when 0..60 then locale.t :x_days, :count => distance_in_days.round | ||
|
r2430 | when 61..720 then locale.t :about_x_months, :count => (distance_in_days / 30).round | ||
|
r2902 | else locale.t :over_x_years, :count => (distance_in_days / 365).floor | ||
|
r2430 | end | ||
end | ||||
end | ||||
end | ||||
end | ||||
|
r9346 | |||
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] | ||||
details = details.dup | ||||
details[:formats] = details[:formats].dup + [:api] | ||||
end | ||||
find_templates(name, prefix, partial, details) | ||||
end | ||||
end | ||||
end | ||||
|
r2430 | end | ||
|
r1609 | |||
|
r9528 | ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe } | ||
|
r2337 | |||
|
r9350 | 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) | ||||
|
r2337 | Thread.start do | ||
|
r9350 | super *args | ||
|
r6572 | end | ||
|
r2337 | end | ||
end | ||||
|
r7726 | |||
|
r9350 | 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 | ||||
|
r7726 | end | ||
|
r2337 | end | ||
|
r9350 | 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 | ||||
|
r4069 | |||
|
r4340 | module ActionController | ||
module MimeResponds | ||||
|
r9346 | class Collector | ||
|
r4340 | def api(&block) | ||
any(:xml, :json, &block) | ||||
end | ||||
end | ||||
end | ||||
end | ||||
|
r9383 | |||
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) | ||||
|
r9422 | $stderr.puts "Please remove config/initializers/session_store.rb and run `rake generate_secret_token`.\n" + | ||
|
r9383 | "Setting the session secret with ActionController.session= is no longer supported in Rails 3." | ||
exit 1 | ||||
end | ||||
end | ||||
end | ||||