From 1c03b98e5dac5f0c5ab931ce6ae749ad31f1c472 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 8 Apr 2009 16:56:01 +0000 Subject: [PATCH] Fixes that custom values length and attachment size validation error raises an error. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2667 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/attachment.rb | 4 +++- app/models/custom_value.rb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 2957b9dd..bffd64bf 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -46,7 +46,9 @@ class Attachment < ActiveRecord::Base @@storage_path = "#{RAILS_ROOT}/files" def validate - errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes + if self.filesize > Setting.attachment_max_size.to_i.kilobytes + errors.add(:base, :too_long, :count => Setting.attachment_max_size.to_i.kilobytes) + end end def file=(incoming_file) diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb index 2d7d1cff..4cace724 100644 --- a/app/models/custom_value.rb +++ b/app/models/custom_value.rb @@ -48,8 +48,8 @@ protected errors.add(:value, :blank) if custom_field.is_required? and value.blank? else errors.add(:value, :invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp) - errors.add(:value, :too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length - errors.add(:value, :too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length + errors.add(:value, :too_short, :count => custom_field.min_length) if custom_field.min_length > 0 and value.length < custom_field.min_length + errors.add(:value, :too_long, :count => custom_field.max_length) if custom_field.max_length > 0 and value.length > custom_field.max_length # Format specific validations case custom_field.field_format