2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

change sets you are reviewing

Browse source
This commit is contained in:
Laura Klünder 2017-12-19 18:48:04 +01:00
parent 309b6e5910
commit c70dbc3655
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/c3nav/editor/templates/editor/user.html
View file

@ -58,8 +58,11 @@
{% include 'editor/fragment_changesets.html' with changesets=recent_changesets %}
{% if can_review %}
<h4>{% trans 'Change sets you are reviewing' %}</h4>
{% include 'editor/fragment_changesets.html' with changesets=reviewing_changesets %}
<h4>{% trans 'Change sets awaiting review' %}</h4>
{% include 'editor/fragment_changesets.html' with changesets=review_changesets %}
{% include 'editor/fragment_changesets.html' with changesets=to_review_changesets %}
<h4>{% trans 'All recent change sets' %}</h4>
{% include 'editor/fragment_changesets.html' with changesets=all_recent_changesets %}

7
src/c3nav/editor/views/users.py
View file

@ -39,7 +39,12 @@ def user_detail(request, pk):
if request.user_permissions.review_changesets:
ctx.update({
'can_review': True,
'review_changesets': ChangeSet.objects.filter(state='proposed').order_by('-last_update'),
'reviewing_changesets': ChangeSet.objects.filter(
assigned_to=user, state='review'
).order_by('-last_update'),
'to_review_changesets': ChangeSet.objects.filter(
state__in=('proposed', 'reproposed'),
).order_by('-last_update'),
'all_recent_changesets': ChangeSet.objects.exclude(state='unproposed').order_by('-last_update')[:20],
})