From cdb42432c3a58efc24f59d9a4bb453288f346eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 17 Jul 2018 12:26:57 +0200 Subject: [PATCH] Jsuinit fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/js/sharedfilelist.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index 6c0aae1eb1..7119249714 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -269,9 +269,15 @@ var files = []; // make sure to use the same format - if(shares[0] && shares[0].ocs) { + if (shares[0] && shares[0].ocs) { shares = shares[0]; } + if (remoteShares && remoteShares[0] && remoteShares[0].ocs) { + remoteShares = remoteShares[0]; + } + if (additionnalShares && additionnalShares[0] && additionnalShares[0].ocs) { + additionnalShares = additionnalShares[0]; + } if (shares.ocs && shares.ocs.data) { files = files.concat(this._makeFilesFromShares(shares.ocs.data, this._sharedWithUser)); @@ -281,10 +287,11 @@ files = files.concat(this._makeFilesFromRemoteShares(remoteShares.ocs.data)); } - if (additionnalShares && additionnalShares[0] && additionnalShares[0].ocs && additionnalShares[0].ocs.data) { - files = files.concat(this._makeFilesFromShares(additionnalShares[0].ocs.data, !this._sharedWithUser)); + if (additionnalShares && additionnalShares && additionnalShares.ocs && additionnalShares.ocs.data) { + files = files.concat(this._makeFilesFromShares(additionnalShares.ocs.data, !this._sharedWithUser)); } + this.setFiles(files); return true; },