gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +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 2017-07-31 14:49:36 +02:00
commit 3074e2f530
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -50,6 +50,7 @@
- show number of users where the select user is a mandatory reviewer/approver of
- fix upload of attachments
- documents, folders, files, events can be moved to a new user
- do not quota information in user manager if quotas are turn off
--------------------------------------------------------------------------------
Changes in version 5.1.2

10
views/bootstrap/class.UsrMgr.php
View File

@ -96,9 +96,13 @@ $(document).ready( function() {
$this->contentHeading(getMLText("user_info"));
echo "<table class=\"table table-condensed\">\n";
echo "<tr><td>".getMLText('discspace')."</td><td>";
$qt = $seluser->getQuota() ? $seluser->getQuota() : $quota;
echo SeedDMS_Core_File::format_filesize($seluser->getUsedDiskSpace())." / ".SeedDMS_Core_File::format_filesize($qt)."<br />";
echo $this->getProgressBar($seluser->getUsedDiskSpace(), $qt);
if($quota) {
$qt = $seluser->getQuota() ? $seluser->getQuota() : $quota;
echo SeedDMS_Core_File::format_filesize($seluser->getUsedDiskSpace())." / ".SeedDMS_Core_File::format_filesize($qt)."<br />";
echo $this->getProgressBar($seluser->getUsedDiskSpace(), $qt);
} else {
echo SeedDMS_Core_File::format_filesize($seluser->getUsedDiskSpace())."<br />";
}
echo "</td></tr>\n";
$documents = $seluser->getDocuments();
echo "<tr><td>".getMLText('documents')."</td><td>".count($documents)."</td></tr>\n";