summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-08-25 16:05:16 +0200
committerRobin Appelman <robin@icewind.nl>2020-09-29 15:26:06 +0200
commitdd1dbc2f3db7295a3cd8abe75e59ac3ecff6f605 (patch)
treeb7417a9e4982c71d824ee2b2e1801cc459cdbab9 /apps/files/js
parent132b299ab2fa6a2df0b922871cfc9cbbb4508083 (diff)
downloadnextcloud-server-dd1dbc2f3db7295a3cd8abe75e59ac3ecff6f605.tar.gz
nextcloud-server-dd1dbc2f3db7295a3cd8abe75e59ac3ecff6f605.zip
show better quota warning for group folders and external storage
instead of showing the generic 'Your storage is full' message, better explain that it's the group folder/external storage that is full Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/files.js50
1 files changed, 36 insertions, 14 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 4d285e426d5..977e642948c 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -72,6 +72,7 @@
$('#free_space').val(response.data.freeSpace);
$('#upload.button').attr('data-original-title', response.data.maxHumanFilesize);
$('#usedSpacePercent').val(response.data.usedSpacePercent);
+ $('#usedSpacePercent').data('mount-type', response.data.mountType);
$('#owner').val(response.data.owner);
$('#ownerDisplayName').val(response.data.ownerDisplayName);
Files.displayStorageWarnings();
@@ -153,21 +154,30 @@
var usedSpacePercent = $('#usedSpacePercent').val(),
owner = $('#owner').val(),
- ownerDisplayName = $('#ownerDisplayName').val();
+ ownerDisplayName = $('#ownerDisplayName').val(),
+ mountType = $('#usedSpacePercent').data('mount-type');
if (usedSpacePercent > 98) {
if (owner !== OC.getCurrentUser().uid) {
OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!',
{owner: ownerDisplayName}), {type: 'error'}
);
- return;
+ } else if (mountType === 'group') {
+ OC.Notification.show(t('files',
+ 'This group folder is full, files can not be updated or synced anymore!'),
+ {type: 'error'}
+ );
+ } else if (mountType === 'external') {
+ OC.Notification.show(t('files',
+ 'This external storage is full, files can not be updated or synced anymore!'),
+ {type : 'error'}
+ );
+ } else {
+ OC.Notification.show(t('files',
+ 'Your storage is full, files can not be updated or synced anymore!'),
+ {type: 'error'}
+ );
}
- OC.Notification.show(t('files',
- 'Your storage is full, files can not be updated or synced anymore!'),
- {type : 'error'}
- );
- return;
- }
- if (usedSpacePercent > 90) {
+ } else if (usedSpacePercent > 90) {
if (owner !== OC.getCurrentUser().uid) {
OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)',
{
@@ -178,12 +188,24 @@
type: 'error'
}
);
- return;
+ } else if (mountType === 'group') {
+ OC.Notification.show(t('files',
+ 'This group folder is almost full ({usedSpacePercent}%)',
+ {usedSpacePercent: usedSpacePercent}),
+ {type : 'error'}
+ );
+ } else if (mountType === 'external') {
+ OC.Notification.show(t('files',
+ 'This external storage is almost full ({usedSpacePercent}%)',
+ {usedSpacePercent: usedSpacePercent}),
+ {type : 'error'}
+ );
+ } else {
+ OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)',
+ {usedSpacePercent: usedSpacePercent}),
+ {type : 'error'}
+ );
}
- OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)',
- {usedSpacePercent: usedSpacePercent}),
- {type : 'error'}
- );
}
},