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

Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporary 

Show storage full warning for shared storages temporary
This commit is contained in:
Vincent Petry 2015-08-13 10:05:53 +02:00
parent 970440f604 e6bf4e559a
commit b811124aac
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files/js/files.js
View File

@ -116,7 +116,7 @@
ownerDisplayName = $('#ownerDisplayName').val(); ownerDisplayName = $('#ownerDisplayName').val();
if (usedSpacePercent > 98) { if (usedSpacePercent > 98) {
if (owner !== oc_current_user) { if (owner !== oc_current_user) {
OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!', OC.Notification.showTemporary(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!',
{ owner: ownerDisplayName })); { owner: ownerDisplayName }));
return; return;
} }
@ -125,7 +125,7 @@
} }
if (usedSpacePercent > 90) { if (usedSpacePercent > 90) {
if (owner !== oc_current_user) { if (owner !== oc_current_user) {
OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)', OC.Notification.showTemporary(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)',
{ usedSpacePercent: usedSpacePercent, owner: ownerDisplayName })); { usedSpacePercent: usedSpacePercent, owner: ownerDisplayName }));
return; return;
} }
@ -234,7 +234,6 @@
// display storage warnings // display storage warnings
setTimeout(Files.displayStorageWarnings, 100); setTimeout(Files.displayStorageWarnings, 100);
OC.Notification.setDefault(Files.displayStorageWarnings);
// only possible at the moment if user is logged in or the files app is loaded // only possible at the moment if user is logged in or the files app is loaded
if (OC.currentUser && OCA.Files.App) { if (OC.currentUser && OCA.Files.App) {