Skip to content

Feature/shares overview #10230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 10 commits into from
Jul 17, 2018
Merged

Feature/shares overview #10230

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1f9e500
Tiny start of the share overview
rullzer Jul 9, 2018
6f45607
Upgraded navigation submenu management and api + created sharing submenu
skjnldsv Jul 13, 2018
e1a2bb9
Fix fav quickaccess ressource addition
skjnldsv Jul 13, 2018
34368cc
Fixed sharing coding style and display - Added all shares overview
skjnldsv Jul 13, 2018
a349f2a
Fixed phpunit
skjnldsv Jul 13, 2018
1879085
Fix share by/with check
skjnldsv Jul 14, 2018
98cf2ba
Rename "Shares overview" to "Shares"
MorrisJobke Jul 16, 2018
c0fcc0e
Make section "deleted shares" a subsection of "shares"
MorrisJobke Jul 16, 2018
92e3069
Reorder position of "Shared by me" and "Shared with me"
MorrisJobke Jul 16, 2018
cdb4243
Jsuinit fixes
skjnldsv Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Jsuinit fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Jul 17, 2018
commit cdb42432c3a58efc24f59d9a4bb453288f346eab
13 changes: 10 additions & 3 deletions apps/files_sharing/js/sharedfilelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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;
},
Expand Down