From 4adc78b78b3f6a659d79eaf17dff3ae5d7f79db7 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 1 Oct 2015 17:20:47 +0200 Subject: Fix and extend unit tests --- apps/files_sharing/js/sharedfilelist.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'apps/files_sharing/js') diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index 84a628345dd..2e798a92578 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -151,6 +151,9 @@ }, }); promises.push(remoteShares); + } else { + //Push empty promise so callback gets called the same way + promises.push($.Deferred().resolve()); } this._reloadCall = $.when.apply($, promises); @@ -174,7 +177,7 @@ // TODO: error handling } - if (remoteShares[0].ocs && remoteShares[0].ocs.data) { + if (remoteShares && remoteShares[0].ocs && remoteShares[0].ocs.data) { files = files.concat(this._makeFilesFromRemoteShares(remoteShares[0].ocs.data)); } else { // TODO: error handling @@ -193,11 +196,12 @@ var file = { shareOwner: share.owner + '@' + share.remote.replace(/.*?:\/\//g, ""), name: OC.basename(share.mountpoint), - mtime: share.mtime, + mtime: share.mtime * 1000, mimetype: share.mimetype, type: share.type, id: share.file_id, - path: OC.dirname(share.mountpoint) + path: OC.dirname(share.mountpoint), + permissions: share.permissions }; file.shares = [{ -- cgit v1.2.3