Skip to content

[stable17] Sharee API GS fixes #18337

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
rullzer merged 3 commits into from
Dec 11, 2019
Merged

[stable17] Sharee API GS fixes #18337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05f12b8
Always do sharee lookup on lookup server in GS
rullzer Nov 28, 2019
31645c6
Expose capability if the lookup server should be queried by default
rullzer Nov 28, 2019
08c4b86
Query lookup by default
skjnldsv Dec 10, 2019
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
Query lookup by default 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Dec 10, 2019
commit 08c4b866787eb763d03f11e806120ca90c6c34b5
2 changes: 1 addition & 1 deletion core/js/dist/share_backend.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/share_backend.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions core/js/sharedialogview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,14 @@
var deferred = $.Deferred();
var view = this;

// query lookup GS by default if enabled
var capabilities = OC.getCapabilities()
if (capabilities.files_sharing
&& capabilities.files_sharing.sharee
&& capabilities.files_sharing.sharee.query_lookup_default) {
this._lookup = true;
}

$.get(
OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees',
{
Expand Down