Rails3: replace deprecate 'validate' instance method to declared validation method at Attachment model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6714 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
94f7b0ea16
commit
af7ec57f15
|
@ -24,6 +24,7 @@ class Attachment < ActiveRecord::Base
|
|||
validates_presence_of :container, :filename, :author
|
||||
validates_length_of :filename, :maximum => 255
|
||||
validates_length_of :disk_filename, :maximum => 255
|
||||
validate :validate_max_file_size
|
||||
|
||||
acts_as_event :title => :filename,
|
||||
:url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
|
||||
|
@ -45,7 +46,7 @@ class Attachment < ActiveRecord::Base
|
|||
cattr_accessor :storage_path
|
||||
@@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{Rails.root}/files"
|
||||
|
||||
def validate
|
||||
def validate_max_file_size
|
||||
if self.filesize > Setting.attachment_max_size.to_i.kilobytes
|
||||
errors.add(:base, :too_long, :count => Setting.attachment_max_size.to_i.kilobytes)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue