diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-17 12:26:57 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-17 12:26:57 +0200 |
| commit | cdb42432c3a58efc24f59d9a4bb453288f346eab (patch) | |
| tree | 3814b7671a0c721fc9b0372d0691d9c603e5ccbf /apps | |
| parent | 92e30698bb3f1387e883e2075360a796b9df996f (diff) | |
| download | nextcloud-server-cdb42432c3a58efc24f59d9a4bb453288f346eab.tar.gz nextcloud-server-cdb42432c3a58efc24f59d9a4bb453288f346eab.zip | |
Jsuinit fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/js/sharedfilelist.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index 6c0aae1eb11..71192497143 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; }, |