Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
56a78289
Commit
56a78289
authored
Apr 17, 2013
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes filtering by user (issue #192)
parent
a61c1d85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
0 deletions
+26
-0
trans/tests/changes.py
trans/tests/changes.py
+12
-0
trans/views/changes.py
trans/views/changes.py
+14
-0
No files found.
trans/tests/changes.py
View file @
56a78289
...
...
@@ -62,3 +62,15 @@ class ChangesTest(ViewTestCase):
)
self
.
assertContains
(
response
,
'Resource update'
)
self
.
assertContains
(
response
,
'Invalid search string!'
)
def
test_user
(
self
):
self
.
edit_unit
(
'Hello, world!
\
n
'
,
'Nazdar svete!
\
n
'
)
response
=
self
.
client
.
get
(
reverse
(
'changes'
),
{
'user'
:
self
.
user
.
username
}
)
self
.
assertContains
(
response
,
'New translation'
)
self
.
assertNotContains
(
response
,
'Invalid search string!'
)
trans/views/changes.py
View file @
56a78289
...
...
@@ -21,6 +21,7 @@
from
django.views.generic.list
import
ListView
from
django.http
import
Http404
from
django.contrib
import
messages
from
django.contrib.auth.models
import
User
from
trans.models.changes
import
Change
from
trans.views.helper
import
get_project_translation
from
lang.models
import
Language
...
...
@@ -39,6 +40,7 @@ class ChangesView(ListView):
subproject
=
None
translation
=
None
language
=
None
user
=
None
# Filtering by translation/project
if
'project'
in
self
.
request
.
GET
:
...
...
@@ -61,6 +63,15 @@ class ChangesView(ListView):
except
Language
.
DoesNotExist
:
messages
.
error
(
self
.
request
,
_
(
'Invalid search string!'
))
# Filtering by user
if
'user'
in
self
.
request
.
GET
:
try
:
user
=
User
.
objects
.
get
(
username
=
self
.
request
.
GET
[
'user'
]
)
except
User
.
DoesNotExist
:
messages
.
error
(
self
.
request
,
_
(
'Invalid search string!'
))
result
=
Change
.
objects
.
all
()
if
translation
is
not
None
:
...
...
@@ -73,4 +84,7 @@ class ChangesView(ListView):
if
language
is
not
None
:
result
=
result
.
filter
(
translation__language
=
language
)
if
user
is
not
None
:
result
=
result
.
filter
(
user
=
user
)
return
result
Write
Preview
Markdown
is supported
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