Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added code to review_section view to sort by all, reviewed, and not reviewed

Browse source
This commit is contained in:
florapdx 2013-04-29 14:02:39 -07:00
parent 40b04240d4
commit 0ad89365e9
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
symposion/reviews/views.py
View file

@ -62,8 +62,10 @@ def proposals_generator(request, queryset, user_pk=None, check_speaker=True):
yield obj yield obj
# Returns a list of all proposals, proposals reviewed by the user, or the proposals the user has yet to review
# depending on the link user clicks in dashboard
@login_required @login_required
def review_section(request, section_slug, assigned=False): def review_section(request, section_slug, assigned=False, reviewed='all'):
if not request.user.has_perm("reviews.can_review_%s" % section_slug): if not request.user.has_perm("reviews.can_review_%s" % section_slug):
return access_not_permitted(request) return access_not_permitted(request)
@ -74,19 +76,28 @@ def review_section(request, section_slug, assigned=False):
if assigned: if assigned:
assignments = ReviewAssignment.objects.filter(user=request.user).values_list("proposal__id") assignments = ReviewAssignment.objects.filter(user=request.user).values_list("proposal__id")
queryset = queryset.filter(id__in=assignments) queryset = queryset.filter(id__in=assignments)
queryset = queryset.select_related("result").select_subclasses() # passing reviewed in from reviews.urls and out to review_list for appropriate template header rendering
if reviewed == 'all':
queryset = queryset.select_related("result").select_subclasses()
reviewed = 'all_reviews'
elif reviewed == 'reviewed':
queryset = queryset.filter(reviews__user=request.user)
reviewed = 'user_reviewed'
else:
queryset = queryset.exclude(reviews__user=request.user).exclude(speaker=request.user)
reviewed = 'user_not_reviewed'
proposals = proposals_generator(request, queryset) proposals = proposals_generator(request, queryset)
ctx = { ctx = {
"proposals": proposals, "proposals": proposals,
"section": section, "section": section,
"reviewed": reviewed,
} }
return render(request, "reviews/review_list.html", ctx) return render(request, "reviews/review_list.html", ctx)
@login_required @login_required
def review_list(request, section_slug, user_pk): def review_list(request, section_slug, user_pk):