gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 20:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2022-04-30 14:58:41 +02:00
commit d13f37cfec
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
views/bootstrap/class.Bootstrap.php
View File

@ -3089,7 +3089,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$revlinks = $document->getReverseDocumentLinks(); $revlinks = $document->getReverseDocumentLinks();
$revlinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $revlinks); $revlinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $revlinks);
$content .= "<div class=\"font-size: 85%;\">"; $content .= "<div style=\"font-size: 85%;\">";
if(count($files)) if(count($files))
$content .= '<i class="fa fa-paperclip" title="'.getMLText("linked_files").'"></i> '.count($files)."<br />"; $content .= '<i class="fa fa-paperclip" title="'.getMLText("linked_files").'"></i> '.count($files)."<br />";
if(count($links) || count($revlinks)) if(count($links) || count($revlinks))
@ -3381,8 +3381,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$rr = 100.0; $rr = 100.0;
else else
$rr = 10.0; $rr = 10.0;
$content .= (!$cc['folder_precise'] ? '~'.(round($cc['folder_count']/$rr)*$rr) : $cc['folder_count'])." ".getMLText("folders")."<br />"; if($cc['folder_count'])
$content .= (!$cc['document_precise'] ? '~'.(round($cc['document_count']/$rr)*$rr) : $cc['document_count'])." ".getMLText("documents"); $content .= '<i class="fa fa-folder" title="'.getMLText("folders").'"></i> '.(!$cc['folder_precise'] ? '~'.(round($cc['folder_count']/$rr)*$rr) : $cc['folder_count'])."<br />";
if($cc['document_count'])
$content .= '<i class="fa fa-file" title="'.getMLText("documents").'"></i> '.(!$cc['document_precise'] ? '~'.(round($cc['document_count']/$rr)*$rr) : $cc['document_count']);
} }
} else { } else {
/* FIXME: the following is very inefficient for just getting the number of /* FIXME: the following is very inefficient for just getting the number of

8
views/bootstrap4/class.Bootstrap4.php
View File

@ -3082,7 +3082,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$revlinks = $document->getReverseDocumentLinks(); $revlinks = $document->getReverseDocumentLinks();
$revlinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $revlinks); $revlinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $revlinks);
$content .= "<div class=\"font-size: 85%;\">"; $content .= "<div style=\"font-size: 85%;\">";
if(count($files)) if(count($files))
$content .= '<i class="fa fa-paperclip" title="'.getMLText("linked_files").'"></i> '.count($files)."<br />"; $content .= '<i class="fa fa-paperclip" title="'.getMLText("linked_files").'"></i> '.count($files)."<br />";
if(count($links) || count($revlinks)) if(count($links) || count($revlinks))
@ -3330,8 +3330,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$rr = 100.0; $rr = 100.0;
else else
$rr = 10.0; $rr = 10.0;
$content .= (!$cc['folder_precise'] ? '~'.(round($cc['folder_count']/$rr)*$rr) : $cc['folder_count'])." ".getMLText("folders")."<br />"; if($cc['folder_count'])
$content .= (!$cc['document_precise'] ? '~'.(round($cc['document_count']/$rr)*$rr) : $cc['document_count'])." ".getMLText("documents"); $content .= '<i class="fa fa-folder" title="'.getMLText("folders").'"></i> '.(!$cc['folder_precise'] ? '~'.(round($cc['folder_count']/$rr)*$rr) : $cc['folder_count'])."<br />";
if($cc['document_count'])
$content .= '<i class="fa fa-file" title="'.getMLText("documents").'"></i> '.(!$cc['document_precise'] ? '~'.(round($cc['document_count']/$rr)*$rr) : $cc['document_count']);
} }
} else { } else {
/* FIXME: the following is very inefficient for just getting the number of /* FIXME: the following is very inefficient for just getting the number of