From 2d06ddf8fe45d2eee3d607490d441a055ab36268 Mon Sep 17 00:00:00 2001
From: "vit.jonas@gmail.com"
 <vit.jonas@gmail.com@5e329b0b-a2ee-ea63-e329-299493fc886d>
Date: Sun, 12 Jun 2011 09:08:07 +0000
Subject: [PATCH] * finished Issue 79: When showing the number of files in a
 folder it should be also counted the sub-folders

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@147 5e329b0b-a2ee-ea63-e329-299493fc886d
---
 app/models/dmsf_folder.rb    | 6 ++++++
 app/views/dmsf/show.html.erb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index f8d2b913..2a37ac4d 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -103,6 +103,12 @@ class DmsfFolder < ActiveRecord::Base
     return tree
   end
 
+  def deep_file_count
+    file_count = self.files.length
+    self.subfolders.each {|subfolder| file_count += subfolder.deep_file_count}
+    file_count
+  end
+
   private
   
   def self.directory_subtree(tree, folder, level, current_folder)
diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index a8865d44..8b813079 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -50,7 +50,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 				<%= link_to(h(subfolder.title),
 		          {:action => "show", :id => @project, :folder_id => subfolder},
 		          :class => "icon icon-folder") %>
-				<div class="filename" title="<%= l(:title_number_of_files_in_directory)%>">[<%= subfolder.files.count %>]</div>
+				<div class="filename" title="<%= l(:title_number_of_files_in_directory)%>">[<%= subfolder.deep_file_count %>]</div>
 			</td>
 			<td class="size">-</td>
 			<td class="modified">-</td>