annotate .svn/pristine/9d/9daef01d8d557400cc7d327fd6c9232f48178a89.svn-base @ 1327:287f201c2802 redmine-2.2-integration

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