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