From 31be631a92a525b1783922e35c911849ca47108d Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Wed, 12 Mar 2014 07:13:42 +0100
Subject: [PATCH] Wrong a folder files count in the main view

---
 app/models/dmsf_folder.rb    | 3 ++-
 app/views/dmsf/_dir.html.erb | 2 +-
 app/views/dmsf/show.html.erb | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 57ec57ab..c138ca7b 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
-# Copyright (C) 2011   Vít Jonáš <vit.jonas@gmail.com>
+# Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright (C) 2011-14 Karel Pičman <karel.picman@konton.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb
index 0c875c12..4f720c7e 100644
--- a/app/views/dmsf/_dir.html.erb
+++ b/app/views/dmsf/_dir.html.erb
@@ -30,7 +30,7 @@
   <% if link %>
     <div class="filename" title="<%= l(:label_target_folder)%>"><%= link.path %></div>
   <% else %>
-    <div class="filename" title="<%= l(:title_number_of_files_in_directory)%>">[<%= subfolder.files.visible.count %>]</div>
+    <div class="filename" title="<%= l(:title_number_of_files_in_directory)%>">[<%= subfolder.files.visible.count + subfolder.file_links.visible.count %>]</div>
   <% end %>
 </td>            
 <td class="size"></td>
diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index 14ac5ded..90c7541d 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -1,9 +1,9 @@
 <%#=
 # Redmine plugin for Document Management System "Features"
 #
-# Copyright (C) 2011 Vít Jonáš <vit.jonas@gmail.com>
-# Copyright (C) 2012 Daniel Munn <dan.munn@munnster.co.uk>
-# Copyright (C) 2014 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright (C) 2012    Daniel Munn <dan.munn@munnster.co.uk>
+# Copyright (C) 2011-14 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License