Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
7a454135
Unverified
Commit
7a454135
authored
5 years ago
by
Roeland Jago Douma
Browse files
Options
Downloads
Patches
Plain Diff
Always do sharee lookup on lookup server in GS
Signed-off-by:
Roeland Jago Douma
<
roeland@famdouma.nl
>
parent
c3d223fa
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
apps/files_sharing/lib/Controller/ShareesAPIController.php
+8
-1
8 additions, 1 deletion
apps/files_sharing/lib/Controller/ShareesAPIController.php
with
8 additions
and
1 deletion
apps/files_sharing/lib/Controller/ShareesAPIController.php
+
8
−
1
View file @
7a454135
...
...
@@ -207,6 +207,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
...
...
@@ -214,7 +222,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
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment