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

Missleading number of entities in documents folder #383

Browse Source
This commit is contained in:
Karel Pičman 2015-04-22 09:35:05 +02:00
parent bcfa798833
commit 89c9b746b1
16 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/dmsf_folder.rb
View File

@ -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

6
app/views/dmsf/_dir.html.erb
View File

@ -1,7 +1,9 @@
<%#=
# encoding: utf-8
#
# Redmine plugin for Document Management System "Features"
#
# Copyright (C) 2011-14 Karel Pičman <karel.picman@kontron.com>
# Copyright (C) 2011-15 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
@ -30,7 +32,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 + subfolder.file_links.visible.count %>]</div>
<div class="filename" title="<%= l(:title_items)%>">[<%= subfolder.items %>]</div>
<% end %>
</td>
<td class="size"></td>

4
app/views/dmsf/_dir_trash.html.erb
View File

@ -1,4 +1,6 @@
<%#=
# encoding: utf-8
#
# Redmine plugin for Document Management System "Features"
#
# Copyright (C) 2011-15 Karel Pičman <karel.picman@kontron.com>
@ -27,7 +29,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 + subfolder.file_links.visible.count %>]</div>
<div class="filename" title="<%= l(:title_items)%>">[<%= subfolder.items %>]</div>
<% end %>
</td>
<td class="size"></td>

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

@ -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 %>";
}
});

4
app/views/dmsf/trash.html.erb
View File

@ -1,4 +1,6 @@
<%#=
# encoding: utf-8
#
# Redmine plugin for Document Management System "Features"
#
# Copyright (C) 2011-15 Karel Pičman <karel.picman@kontron.com>
@ -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 %>";
}
});

2
config/locales/cs.yml
View File

@ -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

2
config/locales/de.yml
View File

@ -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

2
config/locales/en.yml
View File

@ -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

2
config/locales/es.yml
View File

@ -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

2
config/locales/fr.yml
View File

@ -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

2
config/locales/ja.yml
View File

@ -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: 文書

2
config/locales/pl.yml
View File

@ -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

2
config/locales/ru.yml
View File

@ -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: Документов

2
config/locales/sl.yml
View File

@ -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

2
config/locales/zh-TW.yml
View File

@ -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: 文件檔案

2
config/locales/zh.yml
View File

@ -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