From f24386c4913c9e108bdfb8bee15190eaf3e61cab Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 27 Oct 2015 11:51:54 +0100 Subject: [PATCH] Fix file list reload callback result All reloadCallback must return either true for success or false in case of failure / non-existing folder. Some file lists only have a root folder (favorite, shares), so restrict the path to that to avoid having a wrong path in the breadcrumbs. --- apps/files/js/favoritesfilelist.js | 9 ++++++--- apps/files_external/js/mountsfilelist.js | 9 ++++++--- apps/files_sharing/js/sharedfilelist.js | 8 ++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/apps/files/js/favoritesfilelist.js b/apps/files/js/favoritesfilelist.js index 4e7db9f17b..e6532ab188 100644 --- a/apps/files/js/favoritesfilelist.js +++ b/apps/files/js/favoritesfilelist.js @@ -71,6 +71,10 @@ $(document).ready(function() { if (this._reloadCall) { this._reloadCall.abort(); } + + // there is only root + this._setCurrentDir('/', false); + this._reloadCall = $.ajax({ url: OC.generateUrl('/apps/files/api/v1/tags/{tagName}/files', {tagName: tagName}), type: 'GET', @@ -86,10 +90,9 @@ $(document).ready(function() { if (result.files) { this.setFiles(result.files.sort(this._sortComparator)); + return true; } - else { - // TODO: error handling - } + return false; } }); diff --git a/apps/files_external/js/mountsfilelist.js b/apps/files_external/js/mountsfilelist.js index c45faafd9b..35aef751fe 100644 --- a/apps/files_external/js/mountsfilelist.js +++ b/apps/files_external/js/mountsfilelist.js @@ -86,6 +86,10 @@ if (this._reloadCall) { this._reloadCall.abort(); } + + // there is only root + this._setCurrentDir('/', false); + this._reloadCall = $.ajax({ url: OC.linkToOCS('apps/files_external/api/v1') + 'mounts', data: { @@ -106,10 +110,9 @@ if (result.ocs && result.ocs.data) { this.setFiles(this._makeFiles(result.ocs.data)); + return true; } - else { - // TODO: error handling - } + return false; }, /** diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index 2e798a9257..edf138b97a 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -123,6 +123,9 @@ this._reloadCall.abort(); } + // there is only root + this._setCurrentDir('/', false); + var promises = []; var shares = $.ajax({ url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares', @@ -173,17 +176,14 @@ if (shares[0].ocs && shares[0].ocs.data) { files = files.concat(this._makeFilesFromShares(shares[0].ocs.data)); - } else { - // TODO: error handling } if (remoteShares && remoteShares[0].ocs && remoteShares[0].ocs.data) { files = files.concat(this._makeFilesFromRemoteShares(remoteShares[0].ocs.data)); - } else { - // TODO: error handling } this.setFiles(files); + return true; }, _makeFilesFromRemoteShares: function(data) {