Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
1d625c29
Commit
1d625c29
authored
Jun 13, 2020
by
lain
Browse files
ControllerHelper: Always return id field.
parent
4b865bba
Pipeline
#27208
passed with stages
in 8 minutes and 30 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/controller_helper.ex
View file @
1d625c29
...
...
@@ -65,21 +65,11 @@ defp build_pagination_fields(conn, min_id, max_id, extra_params) do
|>
Map
.
merge
(
extra_params
)
|>
Map
.
drop
(
@id_keys
)
fields
=
%{
%{
"next"
=>
current_url
(
conn
,
Map
.
put
(
params
,
:max_id
,
max_id
)),
"prev"
=>
current_url
(
conn
,
Map
.
put
(
params
,
:min_id
,
min_id
))
"prev"
=>
current_url
(
conn
,
Map
.
put
(
params
,
:min_id
,
min_id
)),
"id"
=>
current_url
(
conn
)
}
# Generating an `id` without already present pagination keys would
# need a query-restriction with an `q.id >= ^id` or `q.id <= ^id`
# instead of the `q.id > ^min_id` and `q.id < ^max_id`.
# This is because we only have ids present inside of the page, while
# `min_id`, `since_id` and `max_id` requires to know one outside of it.
if
Map
.
take
(
conn
.
params
,
@id_keys
)
!=
%{}
do
Map
.
put
(
fields
,
"id"
,
current_url
(
conn
))
else
fields
end
end
def
get_pagination_fields
(
conn
,
activities
,
extra_params
\\
%{})
do
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment