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

This commit is contained in:
Uwe Steinmann 2022-04-30 15:55:29 +02:00
commit b412f113bf
2 changed files with 8 additions and 4 deletions

View File

@ -3395,8 +3395,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$subsub = SeedDMS_Core_DMS::filterAccess($subsub, $user, M_READ);
$subdoc = $subFolder->getDocuments();
$subdoc = SeedDMS_Core_DMS::filterAccess($subdoc, $user, M_READ);
$content .= '<i class="fa fa-folder" title="'.getMLText("folders").'"></i> '.count($subsub)."<br />";
$content .= '<i class="fa fa-file" title="'.getMLText("documents").'"></i> '.count($subdoc);
if(count($subsub))
$content .= '<i class="fa fa-folder" title="'.getMLText("folders").'"></i> '.count($subsub)."<br />";
if(count($subdoc))
$content .= '<i class="fa fa-file" title="'.getMLText("documents").'"></i> '.count($subdoc);
}
$content .= "</div>";
return $content;

View File

@ -3344,8 +3344,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$subsub = SeedDMS_Core_DMS::filterAccess($subsub, $user, M_READ);
$subdoc = $subFolder->getDocuments();
$subdoc = SeedDMS_Core_DMS::filterAccess($subdoc, $user, M_READ);
$content .= '<i class="fa fa-folder" title="'.getMLText("folders").'"></i> '.count($subsub)."<br />";
$content .= '<i class="fa fa-file" title="'.getMLText("documents").'"></i> '.count($subdoc);
if(count($subsub))
$content .= '<i class="fa fa-folder" title="'.getMLText("folders").'"></i> '.count($subsub)."<br />";
if(count($subdoc))
$content .= '<i class="fa fa-file" title="'.getMLText("documents").'"></i> '.count($subdoc);
}
$content .= "</div>";
return $content;