meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 23:11:12 +00:00
Code Issues Releases Wiki Activity

Change MD5 table header to Checksum (#25240).

Browse Source 
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16456 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-04-03 11:41:52 +00:00
parent ee84b6b24c
commit 1e179a9bbc
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/attachment.rb
View File

@ -404,6 +404,11 @@ class Attachment < ActiveRecord::Base
self.class.extension_in?(File.extname(filename), extensions) self.class.extension_in?(File.extname(filename), extensions)
end end
# returns either MD5 or SHA256 depending on the way self.digest was computed
def digest_type
digest.size < 64 ? "MD5" : "SHA256" if digest.present?
end
private private
# Physically deletes the file from the file system # Physically deletes the file from the file system

4
app/views/files/index.html.erb
View File

@ -12,7 +12,7 @@
<%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %> <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %> <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
<%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %> <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
<th>MD5</th> <th><%= l(:field_digest) %></th>
<th></th> <th></th>
</tr></thead> </tr></thead>
<tbody> <tbody>
@ -31,7 +31,7 @@
<td class="created_on"><%= format_time(file.created_on) %></td> <td class="created_on"><%= format_time(file.created_on) %></td>
<td class="filesize"><%= number_to_human_size(file.filesize) %></td> <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
<td class="downloads"><%= file.downloads %></td> <td class="downloads"><%= file.downloads %></td>
<td class="digest"><%= file.digest %></td> <td class="digest"><%= file.digest_type %>: <%= file.digest %></td>
<td class="buttons"> <td class="buttons">
<%= link_to(image_tag('delete.png'), attachment_path(file), <%= link_to(image_tag('delete.png'), attachment_path(file),
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>

1
config/locales/en.yml
View File

@ -373,6 +373,7 @@ en:
field_updated_by: Updated by field_updated_by: Updated by
field_last_updated_by: Last updated by field_last_updated_by: Last updated by
field_full_width_layout: Full width layout field_full_width_layout: Full width layout
field_digest: Checksum
setting_app_title: Application title setting_app_title: Application title
setting_app_subtitle: Application subtitle setting_app_subtitle: Application subtitle