upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge pull request #30113 from nextcloud/bugfix/noid/ext-storage-missing-spinner

Browse source
This commit is contained in:
Pytal 2021-12-06 11:07:27 -08:00 committed by GitHub
commit 89e263ee95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_external/css/settings.scss
View file

@ -4,6 +4,10 @@
#externalStorage {
margin: 15px 0 20px 0;
tr.externalStorageLoading > td {
text-align: center;
}
}
#externalStorage td {

12
apps/files_external/js/settings.js
View file

@ -907,6 +907,14 @@ MountConfigListView.prototype = _.extend({
loadStorages: function() {
var self = this;
var onLoaded1 = $.Deferred();
var onLoaded2 = $.Deferred();
this.$el.find('.externalStorageLoading').removeClass('hidden');
$.when(onLoaded1, onLoaded2).always(() => {
self.$el.find('.externalStorageLoading').addClass('hidden');
})
if (this._isPersonal) {
// load userglobal storages
$.ajax({
@ -953,8 +961,11 @@ MountConfigListView.prototype = _.extend({
$('#emptycontent').show();
}
onCompletion.resolve();
onLoaded1.resolve();
}
});
} else {
onLoaded1.resolve();
}
var url = this._storageConfigClass.prototype._url;
@ -973,6 +984,7 @@ MountConfigListView.prototype = _.extend({
self.recheckStorageConfig($tr);
});
onCompletion.resolve();
onLoaded2.resolve();
}
});
},

5
apps/files_external/templates/settings.php
View file

@ -124,6 +124,11 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
</tr>
</thead>
<tbody>
<tr class="externalStorageLoading">
<td colspan="8">
<span id="externalStorageLoading" class="icon icon-loading"></span>
</td>
</tr>
<tr id="addMountPoint"
<?php if (!$canCreateMounts): ?>
style="display: none;"