From 89c9b746b1ea9778be95f6d0a2ee62fdf43e99b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Wed, 22 Apr 2015 09:35:05 +0200 Subject: [PATCH] Missleading number of entities in documents folder #383 --- app/models/dmsf_folder.rb | 9 +++++++++ app/views/dmsf/_dir.html.erb | 6 ++++-- app/views/dmsf/_dir_trash.html.erb | 4 +++- app/views/dmsf/show.html.erb | 2 +- app/views/dmsf/trash.html.erb | 4 +++- config/locales/cs.yml | 2 +- config/locales/de.yml | 2 +- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/ja.yml | 2 +- config/locales/pl.yml | 2 +- config/locales/ru.yml | 2 +- config/locales/sl.yml | 2 +- config/locales/zh-TW.yml | 2 +- config/locales/zh.yml | 2 +- 16 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index d2b032ca..f87d38c8 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -343,6 +343,15 @@ class DmsfFolder < ActiveRecord::Base end last_update end + + # Number of items in the folder + def items + subfolders.visible.count + + files.visible.count + + folder_links.visible.count + + file_links.visible.count + + url_links.visible.count + end private diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb index 574e3b6c..fe8c073f 100644 --- a/app/views/dmsf/_dir.html.erb +++ b/app/views/dmsf/_dir.html.erb @@ -1,7 +1,9 @@ <%#= +# encoding: utf-8 +# # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2011-14 Karel Pičman +# Copyright (C) 2011-15 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -30,7 +32,7 @@ <% if link %>
<%= link.path %>
<% else %> -
[<%= subfolder.files.visible.count + subfolder.file_links.visible.count %>]
+
[<%= subfolder.items %>]
<% end %> diff --git a/app/views/dmsf/_dir_trash.html.erb b/app/views/dmsf/_dir_trash.html.erb index 31f6a452..9159d9b4 100644 --- a/app/views/dmsf/_dir_trash.html.erb +++ b/app/views/dmsf/_dir_trash.html.erb @@ -1,4 +1,6 @@ <%#= +# encoding: utf-8 +# # Redmine plugin for Document Management System "Features" # # Copyright (C) 2011-15 Karel Pičman @@ -27,7 +29,7 @@ <% if link %>
<%= link.path %>
<% else %> -
[<%= subfolder.files.visible.count + subfolder.file_links.visible.count %>]
+
[<%= subfolder.items %>]
<% end %> diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index 2adadf82..2187c514 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -263,7 +263,7 @@ jQuery('div.controls').prependTo(jQuery('#browser_wrapper div.fg-toolbar')[0]); }, 'fnInfoCallback': function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) { - return "<%= l(:label_number_of_folders)%>: <%= @subfolders.count + @dir_links.count %>, <%= l(:label_number_of_documents)%>: <%= @files.count + @file_links.count %>"; + return "<%= l(:label_number_of_folders)%>: <%= @subfolders.count + @dir_links.count %>, <%= l(:label_number_of_documents)%>: <%= @files.count + @file_links.count + @url_links.count %>"; } }); diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb index 8478b707..e7d8a42c 100644 --- a/app/views/dmsf/trash.html.erb +++ b/app/views/dmsf/trash.html.erb @@ -1,4 +1,6 @@ <%#= +# encoding: utf-8 +# # Redmine plugin for Document Management System "Features" # # Copyright (C) 2011-15 Karel Pičman @@ -184,7 +186,7 @@ jQuery('div.controls').prependTo(jQuery('#browser_wrapper div.fg-toolbar')[0]); }, 'fnInfoCallback': function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) { - return "<%= l(:label_number_of_folders)%>: <%= @subfolders.count + @dir_links.count %>, <%= l(:label_number_of_documents)%>: <%= @files.count + @file_links.count %>"; + return "<%= l(:label_number_of_folders)%>: <%= @subfolders.count + @dir_links.count %>, <%= l(:label_number_of_documents)%>: <%= @files.count + @file_links.count + @url_links.count %>"; } }); diff --git a/config/locales/cs.yml b/config/locales/cs.yml index cc12a50e..6f703555 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -166,7 +166,7 @@ cs: notice_entries_deleted: Položky smazány warning_some_entries_were_not_deleted: "Některé položky nebyly smazány: %{entries}" title_delete_checked: Smaž vybrané - title_number_of_files_in_directory: Počet souborů ve složce + title_items: položek title_filename_for_download: Název Zip archívu ke stažení label_number_of_folders: Složky label_number_of_documents: Dokumenty diff --git a/config/locales/de.yml b/config/locales/de.yml index 422750cb..708375a7 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -164,7 +164,7 @@ de: notice_entries_deleted: Einträge löschen warning_some_entries_were_not_deleted: "Enige Einträge wurden nicht gelöscht: %{entries}" title_delete_checked: Löschen ausgewählt - title_number_of_files_in_directory: Dateianzahl in dem Ordner + title_items: items title_filename_for_download: Dateiname beim Herunterladen oder in ZIP-Archiv verwenden label_number_of_folders: Order label_number_of_documents: Dokumente diff --git a/config/locales/en.yml b/config/locales/en.yml index 4ec072d1..ef0098cc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -164,7 +164,7 @@ en: notice_entries_deleted: Entries deleted warning_some_entries_were_not_deleted: "Some entries weren't deleted: %{entries}" title_delete_checked: Delete checked - title_number_of_files_in_directory: Number of files in directory + title_items: items title_filename_for_download: Filename used for download or in Zip archive label_number_of_folders: Folders label_number_of_documents: Documents diff --git a/config/locales/es.yml b/config/locales/es.yml index b5e2f353..a649b72e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -166,7 +166,7 @@ es: notice_entries_deleted: Entradas eliminadas warning_some_entries_were_not_deleted: "Algunas entradas no fueron eliminadas: %{entries}" title_delete_checked: Eliminación chequeada - title_number_of_files_in_directory: Número de archivos en directorio + title_items: items title_filename_for_download: Nombre de archivo utilizado para descargar o crear zip label_number_of_folders: Directorios label_number_of_documents: Documentos diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1e551f06..aa5318b8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -163,7 +163,7 @@ fr: notice_entries_deleted: Elément(s) supprimé(s) warning_some_entries_were_not_deleted: "Certains éléments n'ont pas été supprimés : %{entries}" title_delete_checked: Supprimer les éléments sélectionnés - title_number_of_files_in_directory: Nombre de fichiers dans le dossier + title_items: items title_filename_for_download: "Nom du fichier à utiliser lors du téléchargement ou de l'archive ZIP" label_number_of_folders: Dossiers label_number_of_documents: Fichiers diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 244304f2..5ce5eb39 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -166,7 +166,7 @@ ja: notice_entries_deleted: エントリーを削除しました warning_some_entries_were_not_deleted: "いくつかのエントリーは削除されませんでした: %{entries}" title_delete_checked: チェックしたものを削除します - title_number_of_files_in_directory: フォルダ内のファイル数 + title_items: items title_filename_for_download: ファイル名はダウンロードまたは Zip アーカイブに使われます label_number_of_folders: フォルダ label_number_of_documents: 文書 diff --git a/config/locales/pl.yml b/config/locales/pl.yml index b3b81f4e..744814d3 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -167,7 +167,7 @@ pl: notice_entries_deleted: Wpisy usunięte warning_some_entries_were_not_deleted: "Niektóre wpisy nie zostały usunięte: %{entries}" title_delete_checked: Usuń zaznaczone - title_number_of_files_in_directory: Liczba plików w folderze + title_items: items title_filename_for_download: Nazwa pliku używana do pobierania lub tworzenai archiwum Zip label_number_of_folders: Foldery label_number_of_documents: Dokumenty diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 7cc0a83b..2d315615 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -166,7 +166,7 @@ ru: notice_entries_deleted: Файлы удалены warning_some_entries_were_not_deleted: "Некоторые файлы не были удалены: %{entries}" title_delete_checked: Удалить выбранные документы - title_number_of_files_in_directory: Количество файлов в директории + title_items: items title_filename_for_download: Имя файла для скачиваемого архива label_number_of_folders: Папок label_number_of_documents: Документов diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 31f40f3a..4c341e09 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -166,7 +166,7 @@ sl: notice_entries_deleted: Izbrane enote izbrisane warning_some_entries_were_not_deleted: "Nekatere enote niso izbrisane: %{entries}" title_delete_checked: Izbriši izbrano - title_number_of_files_in_directory: Število datotek v mapi + title_items: items title_filename_for_download: Naziv datoteke za prenos dol ali Zip arhiva label_number_of_folders: Mapa label_number_of_documents: Dokumentacija diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 06922d62..f12c1796 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -167,7 +167,7 @@ zh-TW: notice_entries_deleted: 項目己刪除 warning_some_entries_were_not_deleted: "部份項目無法刪除: %{entries}" title_delete_checked: 刪除選取項目 - title_number_of_files_in_directory: 資料夾的檔案數量 + title_items: items title_filename_for_download: 下載時的檔名，或是ZIP的檔案名稱。 label_number_of_folders: 資料夾 label_number_of_documents: 文件檔案 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 38e4cd59..f64e4892 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -166,7 +166,7 @@ zh: notice_entries_deleted: 条目已删除 warning_some_entries_were_not_deleted: "某些条目未被删除: %{entries}" title_delete_checked: 删除选中 - title_number_of_files_in_directory: 目录总文件个数 + title_items: items title_filename_for_download: 用于下载或zip归档的文件名 label_number_of_folders: Folders label_number_of_documents: Documents