From: Guillaume Pellerin Date: Mon, 16 Dec 2013 22:40:44 +0000 (+0100) Subject: bypass admin progress X-Git-Tag: 2.8.1-pro~442 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=90ac8de4057739efc6c2d50dc05ab8a3ef4d6c7c;p=teleforma.git bypass admin progress --- diff --git a/teleforma/context_processors.py b/teleforma/context_processors.py index 7010804e..33e3b595 100644 --- a/teleforma/context_processors.py +++ b/teleforma/context_processors.py @@ -107,15 +107,16 @@ def all_seminars(request, progress_order=False, date_order=False): elif user.is_staff or user.is_superuser: seminars = Seminar.objects.filter(expiry_date__gte=now) + seminars = [{'seminar': seminar, 'progress': 100} for seminar in seminars] else: seminars = {} - if seminars and progress_order == True: + if not user.is_superuser and seminars and progress_order == True: s_list = [{'seminar': seminar, 'progress': seminar_progress(user, seminar)} for seminar in seminars] seminars = sorted(s_list, key=lambda k: k['progress'], reverse=False) seminars = [s['seminar'] for s in seminars] - if seminars and date_order == True: + if not user.is_superuser and seminars and date_order == True: s_list = [] for seminar in seminars: revisions = SeminarRevision.objects.filter(user=user, seminar=seminar) @@ -145,6 +146,9 @@ def total_progress(request): if not user.is_authenticated(): return {'total_progress': 0} + if user.is_superuser: + return {'total_progress': 100} + seminars = all_seminars(request)['all_seminars'] for seminar in seminars: