7b0cb6aba8
* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags. The hidden tag
needs to appear first in Rails 2.3, otherwise it will override any value in
the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
use layouts. Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
added to the :field_status translation. This resulted in an email string of:
<li>Status<span class="required"> *</span><span class="required"> *</span>
Instead of:
<li>Status: New</li>
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
81 lines
2.4 KiB
Ruby
81 lines
2.4 KiB
Ruby
|
|
require 'activerecord'
|
|
|
|
module ActiveRecord
|
|
class Base
|
|
include Redmine::I18n
|
|
|
|
# Translate attribute names for validation errors display
|
|
def self.human_attribute_name(attr)
|
|
l("field_#{attr.to_s.gsub(/_id$/, '')}")
|
|
end
|
|
end
|
|
end
|
|
|
|
module ActiveRecord
|
|
class Errors
|
|
def full_messages(options = {})
|
|
full_messages = []
|
|
|
|
@errors.each_key do |attr|
|
|
@errors[attr].each do |message|
|
|
next unless message
|
|
|
|
if attr == "base"
|
|
full_messages << message
|
|
elsif attr == "custom_values"
|
|
# Replace the generic "custom values is invalid"
|
|
# with the errors on custom values
|
|
@base.custom_values.each do |value|
|
|
value.errors.each do |attr, msg|
|
|
full_messages << value.custom_field.name + ' ' + msg
|
|
end
|
|
end
|
|
else
|
|
attr_name = @base.class.human_attribute_name(attr)
|
|
full_messages << attr_name + ' ' + message.to_s
|
|
end
|
|
end
|
|
end
|
|
full_messages
|
|
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
|
|
when 0..60 then locale.t :x_days, :count => distance_in_days
|
|
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).round
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
|
|
|
|
# Adds :async_smtp and :async_sendmail delivery methods
|
|
# to perform email deliveries asynchronously
|
|
module AsynchronousMailer
|
|
%w(smtp sendmail).each do |type|
|
|
define_method("perform_delivery_async_#{type}") do |mail|
|
|
Thread.start do
|
|
send "perform_delivery_#{type}", mail
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
ActionMailer::Base.send :include, AsynchronousMailer
|