Merged r2705 from trunk (#3291).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2706 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-05-04 16:50:03 +00:00
parent c5dadfd322
commit ace65df230
1 changed files with 17 additions and 8 deletions

View File

@ -135,8 +135,15 @@ namespace :redmine do
File.file? trac_fullpath
end
def read
File.open("#{trac_fullpath}", 'rb').read
def open
File.open("#{trac_fullpath}", 'rb') {|f|
@file = f
yield self
}
end
def read(*args)
@file.read(*args)
end
def description
@ -506,12 +513,14 @@ namespace :redmine do
# Attachments
ticket.attachments.each do |attachment|
next unless attachment.exist?
a = Attachment.new :created_on => attachment.time
a.file = attachment
a.author = find_or_create_user(attachment.author)
a.container = i
a.description = attachment.description
migrated_ticket_attachments += 1 if a.save
attachment.open {
a = Attachment.new :created_on => attachment.time
a.file = attachment
a.author = find_or_create_user(attachment.author)
a.container = i
a.description = attachment.description
migrated_ticket_attachments += 1 if a.save
}
end
# Custom fields