diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-06-05 20:09:55 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-06-05 20:09:55 +0200 |
| commit | ca10ee4d0dd64cd1b976e89c6d81f4266427e9d6 (patch) | |
| tree | 1e72e9cbd4462e0f751fbc5a4f4e5c98de114e70 /apps/files/js | |
| parent | 3b188d0b72fb003adc83a8b5e24f49d6ebd6b332 (diff) | |
| parent | 62ae39208a0deed71d4cd373c6822946fd489586 (diff) | |
| download | nextcloud-server-ca10ee4d0dd64cd1b976e89c6d81f4266427e9d6.tar.gz nextcloud-server-ca10ee4d0dd64cd1b976e89c6d81f4266427e9d6.zip | |
Merge pull request #16771 from owncloud/fix-storage-full-message
Add owner to the storage stats to enable better notifications
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/files.js | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 68e9315954f..44868e78bd0 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -63,6 +63,8 @@ $('#free_space').val(response.data.freeSpace); $('#upload.button').attr('original-title', response.data.maxHumanFilesize); $('#usedSpacePercent').val(response.data.usedSpacePercent); + $('#owner').val(response.data.owner); + $('#ownerDisplayName').val(response.data.ownerDisplayName); Files.displayStorageWarnings(); } if (response[0] === undefined) { @@ -109,12 +111,24 @@ return; } - var usedSpacePercent = $('#usedSpacePercent').val(); + var usedSpacePercent = $('#usedSpacePercent').val(), + owner = $('#owner').val(), + ownerDisplayName = $('#ownerDisplayName').val(); if (usedSpacePercent > 98) { + if (owner !== oc_current_user) { + OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!', + { owner: ownerDisplayName })); + return; + } OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!')); return; } if (usedSpacePercent > 90) { + if (owner !== oc_current_user) { + OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)', + { usedSpacePercent: usedSpacePercent, owner: ownerDisplayName })); + return; + } OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent})); } |