Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
a66cc6af
Commit
a66cc6af
authored
5 years ago
by
Guillaume Heurtier
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #12091 TIME 2:00 added followed resources in search scope
parent
278dbf75
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
core/class/class_request.php
+9
-2
9 additions, 2 deletions
core/class/class_request.php
with
9 additions
and
2 deletions
core/class/class_request.php
+
9
−
2
View file @
a66cc6af
...
@@ -137,8 +137,15 @@ where
...
@@ -137,8 +137,15 @@ where
where users_entities.user_id = :user_id_folders
where users_entities.user_id = :user_id_folders
)"
;
)"
;
$where_string
=
''
.
$where_string
.
" and ( "
.
$_SESSION
[
'user'
][
'security'
][
$coll
][
'DOC'
][
'where'
]
.
" or res_id in ("
.
$whereFolders
.
")) "
;
$whereFollowed
=
"select res_id from users_followed_resources where user_id = :user_id_followed"
;
$parameters
=
array_merge
(
$parameters
,
array
(
":user_id_folders"
=>
$_SESSION
[
'user'
][
'UserId'
]));
$user
=
\User\models\UserModel
::
getByLogin
([
'login'
=>
$_SESSION
[
'user'
][
'UserId'
],
'select'
=>
[
'id'
]]);
$where_string
=
''
.
$where_string
.
" and ( "
.
$_SESSION
[
'user'
][
'security'
][
$coll
][
'DOC'
][
'where'
]
.
" or res_id in ("
.
$whereFolders
.
") or res_id in ("
.
$whereFollowed
.
")) "
;
$parameters
=
array_merge
(
$parameters
,
[
"user_id_folders"
=>
$_SESSION
[
'user'
][
'UserId'
],
"user_id_followed"
=>
$user
[
'id'
]
]);
}
}
break
;
break
;
...
...
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