symposion_app File Diff · Conservancy Kallithea

...

@@ -66,13 +66,13 @@ def proposals_generator(request, queryset, user_pk=None, check_speaker=True):

def review_section(request, section_slug, assigned=False, reviewed="all"):

    if not request.user.has_perm("reviews.can_review_%s" % section_slug):

        return access_not_permitted(request)

    section = get_object_or_404(ProposalSection, section__slug=section_slug)

    queryset = ProposalBase.objects.filter(kind__section=section)

    queryset = ProposalBase.objects.filter(kind__section=section.section)

    if assigned:

        assignments = ReviewAssignment.objects.filter(user=request.user)\

            .values_list("proposal__id")

        queryset = queryset.filter(id__in=assignments)

...

@@ -340,14 +340,13 @@ def review_status(request, section_slug=None, key=None):

    admin = request.user.has_perm("reviews.can_manage_%s" % section_slug)

    for status in proposals:

        if key and key != status:

            continue

        proposals[status] = list(proposals_generator(request, proposals[status],

                                                     check_speaker=not admin))

        proposals[status] = list(proposals_generator(request, proposals[status], check_speaker=not admin))

    if key:

        ctx.update({

            "key": key,

            "proposals": proposals[key],

})

...

@@ -406,15 +405,13 @@ def review_bulk_accept(request, section_slug):

@login_required

def result_notification(request, section_slug, status):

    if not request.user.has_perm("reviews.can_manage_%s" % section_slug):

        return access_not_permitted(request)

    proposals = ProposalBase.objects.filter(kind__section__slug=section_slug,

                                            result__status=status)\

        .select_related("speaker__user", "result").select_subclasses()

    proposals = ProposalBase.objects.filter(kind__section__slug=section_slug, result__status=status).select_related("speaker__user", "result").select_subclasses()

    notification_templates = NotificationTemplate.objects.all()

    ctx = {

        "section_slug": section_slug,

        "status": status,

        "proposals": proposals,