Merged r2664, r2665, r2670, r2674, r2677, r2679 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2681 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -65,14 +65,20 @@ class Attachment < ActiveRecord::Base
|
||||
nil
|
||||
end
|
||||
|
||||
# Copy temp file to its final location
|
||||
# Copies the temporary file to its final location
|
||||
# and computes its MD5 hash
|
||||
def before_save
|
||||
if @temp_file && (@temp_file.size > 0)
|
||||
logger.debug("saving '#{self.diskfile}'")
|
||||
md5 = Digest::MD5.new
|
||||
File.open(diskfile, "wb") do |f|
|
||||
f.write(@temp_file.read)
|
||||
buffer = ""
|
||||
while (buffer = @temp_file.read(8192))
|
||||
f.write(buffer)
|
||||
md5.update(buffer)
|
||||
end
|
||||
end
|
||||
self.digest = self.class.digest(diskfile)
|
||||
self.digest = md5.hexdigest
|
||||
end
|
||||
# Don't save the content type if it's longer than the authorized length
|
||||
if self.content_type && self.content_type.length > 255
|
||||
@@ -141,11 +147,4 @@ private
|
||||
end
|
||||
df
|
||||
end
|
||||
|
||||
# Returns the MD5 digest of the file at given path
|
||||
def self.digest(filename)
|
||||
File.open(filename, 'rb') do |f|
|
||||
Digest::MD5.hexdigest(f.read)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
<h2><%=l(:label_settings)%></h2>
|
||||
|
||||
<% tabs = project_settings_tabs %>
|
||||
|
||||
<% if tabs.any? %>
|
||||
<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
|
||||
|
||||
<div class="tabs">
|
||||
@@ -20,5 +22,8 @@
|
||||
:style => (tab[:name] != selected_tab ? 'display:none' : nil),
|
||||
:class => 'tab-content') %>
|
||||
<% end -%>
|
||||
<% else %>
|
||||
<p class="nodata"><%= l(:label_no_data) %></p>
|
||||
<% end %>
|
||||
|
||||
<% html_title(l(:label_settings)) -%>
|
||||
|
||||
Reference in New Issue
Block a user