mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18347 from nextcloud/backport/18144/stable16 

[stable16] ShareeAPI GS fixes
This commit is contained in:
Roeland Jago Douma 2019-12-11 10:58:44 +01:00 committed by GitHub
parent 8af38e7dcf f3d9c1f005
commit cdd0e4d3ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_sharing/lib/Capabilities.php
View File

@ -98,6 +98,11 @@ class Capabilities implements ICapability {
'expire_date' => ['enabled' => true]
];
// Sharee searches
$res['sharee'] = [
'query_lookup_default' => $this->config->getSystemValueBool('gs.enabled', false)
];
return [
'files_sharing' => $res,
];

9
apps/files_sharing/lib/Controller/ShareesAPIController.php
View File

@ -206,6 +206,14 @@ class ShareesAPIController extends OCSController {
$this->limit = (int) $perPage;
$this->offset = $perPage * ($page - 1);
// In global scale mode we always search the loogup server
if ($this->config->getSystemValueBool('gs.enabled', false)) {
$lookup = true;
$this->result['lookupEnabled'] = true;
} else {
$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
}
list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
@ -213,7 +221,6 @@ class ShareesAPIController extends OCSController {
$result['exact'] = array_merge($this->result['exact'], $result['exact']);
}
$this->result = array_merge($this->result, $result);
$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
$response = new DataResponse($this->result);
if ($hasMoreResults) {

8
core/js/sharedialogview.js
View File

@ -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',
{