Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
internewshid
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aptivate
client-projects
internewshid
Commits
c02184ec
Commit
c02184ec
authored
5 years ago
by
Martin Burchell
Browse files
Options
Downloads
Patches
Plain Diff
Search on translation as well as message
parent
f30e1f00
No related branches found
Branches containing commit
No related tags found
2 merge requests
!166
Staging
,
!137
Keyword search
Pipeline
#9033
passed
5 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
internewshid/rest_api/tests/item_list_view_tests.py
+49
-0
49 additions, 0 deletions
internewshid/rest_api/tests/item_list_view_tests.py
internewshid/rest_api/views.py
+3
-2
3 additions, 2 deletions
internewshid/rest_api/views.py
with
52 additions
and
2 deletions
internewshid/rest_api/tests/item_list_view_tests.py
+
49
−
0
View file @
c02184ec
...
...
@@ -373,3 +373,52 @@ Mauris nec mauris vestibulum, laoreet mi ut, facilisis massa. Pellentesque
assert
'
Latrine
'
in
payload
[
0
][
'
body
'
]
assert
'
LATRINE
'
in
payload
[
1
][
'
body
'
]
assert
'
latrines
'
in
payload
[
2
][
'
body
'
]
@pytest.mark.django_db
def
test_filter_translation_by_keyword
():
create_item
(
body
=
"
item 1
"
,
translation
=
"""
Latrine ipsum dolor sit amet, consectetur adipiscing elit.
Pellentesque vitae ipsum a magna rutrum facilisis. Fusce vitae dolor dolor.
Nullam.
"""
)
create_item
(
body
=
"
item 2
"
,
translation
=
"""
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Suspendisse ut orci diam. Donec scelerisque id massa vitae laoreet. Ut sit.
"""
)
create_item
(
body
=
"
item 3
"
,
translation
=
"""
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Pellentesque ac orci felis. Pellentesque hendrerit laoreet dolor nec euismod.
Fusce pretium.
"""
)
create_item
(
body
=
"
item 4
"
,
translation
=
"""
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Donec at justo sit amet ante LATRINE semper tempus. Suspendisse vulputate
urna nec.
"""
)
create_item
(
body
=
"
item 5
"
,
translation
=
"""
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Mauris nec mauris vestibulum, laoreet mi ut, facilisis massa.
Pellentesque quam tortor. latrines
"""
,
)
payload
=
get
(
data
=
{
'
search
'
:
'
latrine
'
,
}
).
data
assert
len
(
payload
)
==
3
assert
'
Latrine
'
in
payload
[
0
][
'
translation
'
]
assert
'
LATRINE
'
in
payload
[
1
][
'
translation
'
]
assert
'
latrines
'
in
payload
[
2
][
'
translation
'
]
This diff is collapsed.
Click to expand it.
internewshid/rest_api/views.py
+
3
−
2
View file @
c02184ec
from
django.db.models
import
Count
from
django.db.models
import
Count
,
Q
from
django.utils.translation
import
ugettext
as
_
from
rest_framework
import
status
,
viewsets
...
...
@@ -108,7 +108,8 @@ class ItemViewSet(viewsets.ModelViewSet, BulkDestroyModelMixin):
search
=
self
.
request
.
query_params
.
get
(
'
search
'
,
None
)
if
search
is
not
None
:
items
=
items
.
filter
(
body__icontains
=
search
)
items
=
items
.
filter
(
Q
(
body__icontains
=
search
)
|
Q
(
translation__icontains
=
search
))
ordering
=
self
.
request
.
query_params
.
get
(
'
ordering
'
,
'
-timestamp
'
)
items
=
items
.
order_by
(
ordering
)
...
...
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