Merge pull request #20079 from owncloud/filelist-invalidpath

Fix file list reload callback result
This commit is contained in:
Thomas Müller 2015-10-29 09:21:30 +01:00
commit 5bf476efd0
3 changed files with 16 additions and 10 deletions

View File

@ -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;
}
});

View File

@ -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;
},
/**

View File

@ -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) {