mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22913 from nextcloud/group-folder-quota-warning-mountpoint 

add mount point to quota warning message
This commit is contained in:
Roeland Jago Douma 2020-10-04 12:57:56 +02:00 committed by GitHub
parent 0bca480efd 0dfdf3ee99
commit f312cfade0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/files/js/files.js
View File

@ -73,6 +73,7 @@
$('#upload.button').attr('data-original-title', response.data.maxHumanFilesize); $('#upload.button').attr('data-original-title', response.data.maxHumanFilesize);
$('#usedSpacePercent').val(response.data.usedSpacePercent); $('#usedSpacePercent').val(response.data.usedSpacePercent);
$('#usedSpacePercent').data('mount-type', response.data.mountType); $('#usedSpacePercent').data('mount-type', response.data.mountType);
$('#usedSpacePercent').data('mount-point', response.data.mountPoint);
$('#owner').val(response.data.owner); $('#owner').val(response.data.owner);
$('#ownerDisplayName').val(response.data.ownerDisplayName); $('#ownerDisplayName').val(response.data.ownerDisplayName);
Files.displayStorageWarnings(); Files.displayStorageWarnings();
@ -157,7 +158,8 @@
var usedSpacePercent = $('#usedSpacePercent').val(), var usedSpacePercent = $('#usedSpacePercent').val(),
owner = $('#owner').val(), owner = $('#owner').val(),
ownerDisplayName = $('#ownerDisplayName').val(), ownerDisplayName = $('#ownerDisplayName').val(),
mountType = $('#usedSpacePercent').data('mount-type'); mountType = $('#usedSpacePercent').data('mount-type'),
mountPoint = $('#usedSpacePercent').data('mount-point');
if (usedSpacePercent > 98) { if (usedSpacePercent > 98) {
if (owner !== OC.getCurrentUser().uid) { if (owner !== OC.getCurrentUser().uid) {
OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!', OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!',
@ -165,12 +167,14 @@
); );
} else if (mountType === 'group') { } else if (mountType === 'group') {
OC.Notification.show(t('files', OC.Notification.show(t('files',
'This group folder is full, files can not be updated or synced anymore!'), 'Group folder "{mountPoint}" is full, files can not be updated or synced anymore!',
{mountPoint: mountPoint}),
{type: 'error'} {type: 'error'}
); );
} else if (mountType === 'external') { } else if (mountType === 'external') {
OC.Notification.show(t('files', OC.Notification.show(t('files',
'This external storage is full, files can not be updated or synced anymore!'), 'External storage "{mountPoint}" is full, files can not be updated or synced anymore!',
{mountPoint: mountPoint}),
{type : 'error'} {type : 'error'}
); );
} else { } else {
@ -192,14 +196,14 @@
); );
} else if (mountType === 'group') { } else if (mountType === 'group') {
OC.Notification.show(t('files', OC.Notification.show(t('files',
'This group folder is almost full ({usedSpacePercent}%).', 'Group folder "{mountPoint}" is almost full ({usedSpacePercent}%).',
{usedSpacePercent: usedSpacePercent}), {mountPoint: mountPoint, usedSpacePercent: usedSpacePercent}),
{type : 'error'} {type : 'error'}
); );
} else if (mountType === 'external') { } else if (mountType === 'external') {
OC.Notification.show(t('files', OC.Notification.show(t('files',
'This external storage is almost full ({usedSpacePercent}%).', 'External storage "{mountPoint}" is almost full ({usedSpacePercent}%).',
{usedSpacePercent: usedSpacePercent}), {mountPoint: mountPoint, usedSpacePercent: usedSpacePercent}),
{type : 'error'} {type : 'error'}
); );
} else { } else {

1
apps/files/lib/Helper.php
View File

@ -64,6 +64,7 @@ class Helper {
'owner' => $storageInfo['owner'], 'owner' => $storageInfo['owner'],
'ownerDisplayName' => $storageInfo['ownerDisplayName'], 'ownerDisplayName' => $storageInfo['ownerDisplayName'],
'mountType' => $storageInfo['mountType'], 'mountType' => $storageInfo['mountType'],
'mountPoint' => $storageInfo['mountPoint'],
]; ];
} }

4
lib/private/legacy/OC_Helper.php
View File

@ -545,6 +545,7 @@ class OC_Helper {
if ($owner) { if ($owner) {
$ownerDisplayName = $owner->getDisplayName(); $ownerDisplayName = $owner->getDisplayName();
} }
[,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
return [ return [
'free' => $free, 'free' => $free,
@ -554,7 +555,8 @@ class OC_Helper {
'relative' => $relative, 'relative' => $relative,
'owner' => $ownerId, 'owner' => $ownerId,
'ownerDisplayName' => $ownerDisplayName, 'ownerDisplayName' => $ownerDisplayName,
'mountType' => $mount->getMountType() 'mountType' => $mount->getMountType(),
'mountPoint' => trim($mountPoint, '/'),
]; ];
} }