annotate .svn/pristine/9d/9daef01d8d557400cc7d327fd6c9232f48178a89.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 require 'active_record'
Chris@1295 2
Chris@1295 3 module ActiveRecord
Chris@1295 4 class Base
Chris@1295 5 include Redmine::I18n
Chris@1295 6 # Translate attribute names for validation errors display
Chris@1295 7 def self.human_attribute_name(attr, *args)
Chris@1295 8 attr = attr.to_s.sub(/_id$/, '')
Chris@1295 9
Chris@1295 10 l("field_#{name.underscore.gsub('/', '_')}_#{attr}", :default => ["field_#{attr}".to_sym, attr])
Chris@1295 11 end
Chris@1295 12 end
Chris@1295 13
Chris@1295 14 # Undefines private Kernel#open method to allow using `open` scopes in models.
Chris@1295 15 # See Defect #11545 (http://www.redmine.org/issues/11545) for details.
Chris@1295 16 class Base
Chris@1295 17 class << self
Chris@1295 18 undef open
Chris@1295 19 end
Chris@1295 20 end
Chris@1295 21 class Relation ; undef open ; end
Chris@1295 22 end
Chris@1295 23
Chris@1295 24 module ActionView
Chris@1295 25 module Helpers
Chris@1295 26 module DateHelper
Chris@1295 27 # distance_of_time_in_words breaks when difference is greater than 30 years
Chris@1295 28 def distance_of_date_in_words(from_date, to_date = 0, options = {})
Chris@1295 29 from_date = from_date.to_date if from_date.respond_to?(:to_date)
Chris@1295 30 to_date = to_date.to_date if to_date.respond_to?(:to_date)
Chris@1295 31 distance_in_days = (to_date - from_date).abs
Chris@1295 32
Chris@1295 33 I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
Chris@1295 34 case distance_in_days
Chris@1295 35 when 0..60 then locale.t :x_days, :count => distance_in_days.round
Chris@1295 36 when 61..720 then locale.t :about_x_months, :count => (distance_in_days / 30).round
Chris@1295 37 else locale.t :over_x_years, :count => (distance_in_days / 365).floor
Chris@1295 38 end
Chris@1295 39 end
Chris@1295 40 end
Chris@1295 41 end
Chris@1295 42 end
Chris@1295 43
Chris@1295 44 class Resolver
Chris@1295 45 def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
Chris@1295 46 cached(key, [name, prefix, partial], details, locals) do
Chris@1295 47 if details[:formats] & [:xml, :json]
Chris@1295 48 details = details.dup
Chris@1295 49 details[:formats] = details[:formats].dup + [:api]
Chris@1295 50 end
Chris@1295 51 find_templates(name, prefix, partial, details)
Chris@1295 52 end
Chris@1295 53 end
Chris@1295 54 end
Chris@1295 55 end
Chris@1295 56
Chris@1295 57 # Do not HTML escape text templates
Chris@1295 58 module ActionView
Chris@1295 59 class Template
Chris@1295 60 module Handlers
Chris@1295 61 class ERB
Chris@1295 62 def call(template)
Chris@1295 63 if template.source.encoding_aware?
Chris@1295 64 # First, convert to BINARY, so in case the encoding is
Chris@1295 65 # wrong, we can still find an encoding tag
Chris@1295 66 # (<%# encoding %>) inside the String using a regular
Chris@1295 67 # expression
Chris@1295 68 template_source = template.source.dup.force_encoding("BINARY")
Chris@1295 69
Chris@1295 70 erb = template_source.gsub(ENCODING_TAG, '')
Chris@1295 71 encoding = $2
Chris@1295 72
Chris@1295 73 erb.force_encoding valid_encoding(template.source.dup, encoding)
Chris@1295 74
Chris@1295 75 # Always make sure we return a String in the default_internal
Chris@1295 76 erb.encode!
Chris@1295 77 else
Chris@1295 78 erb = template.source.dup
Chris@1295 79 end
Chris@1295 80
Chris@1295 81 self.class.erb_implementation.new(
Chris@1295 82 erb,
Chris@1295 83 :trim => (self.class.erb_trim_mode == "-"),
Chris@1295 84 :escape => template.identifier =~ /\.text/ # only escape HTML templates
Chris@1295 85 ).src
Chris@1295 86 end
Chris@1295 87 end
Chris@1295 88 end
Chris@1295 89 end
Chris@1295 90 end
Chris@1295 91
Chris@1295 92 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
Chris@1295 93
Chris@1295 94 require 'mail'
Chris@1295 95
Chris@1295 96 module DeliveryMethods
Chris@1295 97 class AsyncSMTP < ::Mail::SMTP
Chris@1295 98 def deliver!(*args)
Chris@1295 99 Thread.start do
Chris@1295 100 super *args
Chris@1295 101 end
Chris@1295 102 end
Chris@1295 103 end
Chris@1295 104
Chris@1295 105 class AsyncSendmail < ::Mail::Sendmail
Chris@1295 106 def deliver!(*args)
Chris@1295 107 Thread.start do
Chris@1295 108 super *args
Chris@1295 109 end
Chris@1295 110 end
Chris@1295 111 end
Chris@1295 112
Chris@1295 113 class TmpFile
Chris@1295 114 def initialize(*args); end
Chris@1295 115
Chris@1295 116 def deliver!(mail)
Chris@1295 117 dest_dir = File.join(Rails.root, 'tmp', 'emails')
Chris@1295 118 Dir.mkdir(dest_dir) unless File.directory?(dest_dir)
Chris@1295 119 File.open(File.join(dest_dir, mail.message_id.gsub(/[<>]/, '') + '.eml'), 'wb') {|f| f.write(mail.encoded) }
Chris@1295 120 end
Chris@1295 121 end
Chris@1295 122 end
Chris@1295 123
Chris@1295 124 ActionMailer::Base.add_delivery_method :async_smtp, DeliveryMethods::AsyncSMTP
Chris@1295 125 ActionMailer::Base.add_delivery_method :async_sendmail, DeliveryMethods::AsyncSendmail
Chris@1295 126 ActionMailer::Base.add_delivery_method :tmp_file, DeliveryMethods::TmpFile
Chris@1295 127
Chris@1295 128 # Changes how sent emails are logged
Chris@1295 129 # Rails doesn't log cc and bcc which is misleading when using bcc only (#12090)
Chris@1295 130 module ActionMailer
Chris@1295 131 class LogSubscriber < ActiveSupport::LogSubscriber
Chris@1295 132 def deliver(event)
Chris@1295 133 recipients = [:to, :cc, :bcc].inject("") do |s, header|
Chris@1295 134 r = Array.wrap(event.payload[header])
Chris@1295 135 if r.any?
Chris@1295 136 s << "\n #{header}: #{r.join(', ')}"
Chris@1295 137 end
Chris@1295 138 s
Chris@1295 139 end
Chris@1295 140 info("\nSent email \"#{event.payload[:subject]}\" (%1.fms)#{recipients}" % event.duration)
Chris@1295 141 debug(event.payload[:mail])
Chris@1295 142 end
Chris@1295 143 end
Chris@1295 144 end
Chris@1295 145
Chris@1295 146 module ActionController
Chris@1295 147 module MimeResponds
Chris@1295 148 class Collector
Chris@1295 149 def api(&block)
Chris@1295 150 any(:xml, :json, &block)
Chris@1295 151 end
Chris@1295 152 end
Chris@1295 153 end
Chris@1295 154 end
Chris@1295 155
Chris@1295 156 module ActionController
Chris@1295 157 class Base
Chris@1295 158 # Displays an explicit message instead of a NoMethodError exception
Chris@1295 159 # when trying to start Redmine with an old session_store.rb
Chris@1295 160 # TODO: remove it in a later version
Chris@1295 161 def self.session=(*args)
Chris@1295 162 $stderr.puts "Please remove config/initializers/session_store.rb and run `rake generate_secret_token`.\n" +
Chris@1295 163 "Setting the session secret with ActionController.session= is no longer supported in Rails 3."
Chris@1295 164 exit 1
Chris@1295 165 end
Chris@1295 166 end
Chris@1295 167 end