From 78dbbf4b1af4a461a9cb34831ee9e04be6dd1cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Tue, 19 Dec 2017 17:53:24 +0100 Subject: [PATCH] show change sets awaiting review --- src/c3nav/editor/templates/editor/user.html | 8 ++++++++ src/c3nav/editor/views/users.py | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/c3nav/editor/templates/editor/user.html b/src/c3nav/editor/templates/editor/user.html index 8b5c7f7f..d6be6b63 100644 --- a/src/c3nav/editor/templates/editor/user.html +++ b/src/c3nav/editor/templates/editor/user.html @@ -57,4 +57,12 @@

{% trans 'Recent change sets' %}

{% include 'editor/fragment_changesets.html' with changesets=recent_changesets %} +{% if can_review %} +

{% trans 'Change sets awaiting review' %}

+ {% include 'editor/fragment_changesets.html' with changesets=review_changesets %} + +

{% trans 'All recent change sets' %}

+ {% include 'editor/fragment_changesets.html' with changesets=all_recent_changesets %} +{% endif %} + diff --git a/src/c3nav/editor/views/users.py b/src/c3nav/editor/views/users.py index 2423c224..abafd772 100644 --- a/src/c3nav/editor/views/users.py +++ b/src/c3nav/editor/views/users.py @@ -33,7 +33,14 @@ def user_detail(request, pk): ctx = { 'user': user, 'can_direct_edit': ChangeSet.can_direct_edit(request), - 'recent_changesets': ChangeSet.objects.filter(author=user).order_by('-last_update')[:10], + 'recent_changesets': ChangeSet.objects.filter(author=user).order_by('-last_update')[:15], } + if request.user_permissions.review_changesets: + ctx.update({ + 'can_review': True, + 'review_changesets': ChangeSet.objects.filter(state='proposed').order_by('-last_update'), + 'all_recent_changesets': ChangeSet.objects.exclude(state='unproposed').order_by('-last_update')[:20], + }) + return render(request, 'editor/user.html', ctx)