redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* included total size for folders

Browse Source 
git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@195 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-07-07 08:27:22 +00:00
parent d8aea7493a
commit e5d2d9071b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/dmsf_file.rb
View File

@ -143,6 +143,10 @@ class DmsfFile < ActiveRecord::Base
self.last_revision.workflow
end
def size
self.last_revision.size
end
def dmsf_path
path = self.folder.nil? ? [] : self.folder.dmsf_path
path.push(self)

7
app/models/dmsf_folder.rb
View File

@ -109,6 +109,13 @@ class DmsfFolder < ActiveRecord::Base
file_count
end
def deep_size
size = 0
self.files.each {|file| size += file.size}
self.subfolders.each {|subfolder| size += subfolder.deep_size}
size
end
private
def self.directory_subtree(tree, folder, level, current_folder)

8
app/views/dmsf/show.html.erb
View File

@ -61,7 +61,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
:class => "icon icon-folder") %>
<div class="filename" title="<%= l(:title_number_of_files_in_directory)%>">[<%= subfolder.deep_file_count %>]</div>
</td>
<td class="size"></td>
<td class="size"><%= number_to_human_size(subfolder.deep_size) %></td>
<td class="modified"></td>
<td class="version"></td>
<td class="author"></td>
@ -97,7 +97,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
<br class="clear" />
</td>
<td class="hidden">0</td>
<td class="hidden"><%= subfolder.deep_file_count %></td>
<td class="hidden"><%= subfolder.deep_size %></td>
</tr>
<% end %>
<% @files.each do |file| %>
@ -110,9 +110,9 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
:title => l(:title_title_version_version_download, :title => h(file.title), :version => file.version)) %>
<div class="filename" title="<%= l(:title_filename_for_download)%>"><%= h(file.display_name) %></div>
</td>
<td class="size"><%= number_to_human_size(file.last_revision.size) unless file.last_revision.nil? %></td>
<td class="size"><%= number_to_human_size(file.last_revision.size) %></td>
<td class="modified">
<%= file.last_revision.updated_at.strftime("%Y-%m-%d %H:%M") unless file.last_revision.nil? %>
<%= file.last_revision.updated_at.strftime("%Y-%m-%d %H:%M") %>
<% if file.locked_for_user? %>
<%= link_to(image_tag("locked.png", :plugin => "redmine_dmsf"),
{:controller => "users", :action => "show", :id => file.locks[0].user },