Revision d68590fd snf-astakos-app/astakos/im/views.py

b/snf-astakos-app/astakos/im/views.py
611 611
        group = AstakosGroup.objects.select_related().get(id=group_id)
612 612
    except AstakosGroup.DoesNotExist:
613 613
        return HttpResponseBadRequest(_('Invalid group.'))
614
    d = {}
615
    related_resources = group.policy.through.objects
616
    for r in group.policy.all():
617
        d[r.name] = related_resources.get(resource__id=r.id, 
618
                                            group__id=group_id).limit
619 614
    members = map(lambda m:{m.person.realname:m.is_approved}, group.membership_set.all())
620 615
    return object_detail(request,
621 616
                            AstakosGroup.objects.all(),
622 617
                            object_id=group_id,
623
                            extra_context = {'quota':d,
618
                            extra_context = {'quota':group.get_policies(),
624 619
                                             'members':members,
625
                                             'form':get_astakos_group_policy_creation_form(group)})
620
                                             'form':get_astakos_group_policy_creation_form(group),
621
                                             'more_policies':group.has_undefined_policies()})
626 622

  
627 623
@signed_terms_required
628 624
@login_required
......
636 632
        group = AstakosGroup.objects.select_related().get(id=group_id)
637 633
    except AstakosGroup.DoesNotExist:
638 634
        return HttpResponseBadRequest(_('Invalid group.'))
639
    d = {}
640
    for resource in group.policy.all():
641
        d[resource.name] = group.policy.through.objects.get(resource__id=resource.id,
642
                                                            group__id=group_id).limit
643 635
    return create_object(request,
644 636
                            form_class=get_astakos_group_policy_creation_form(group),
645 637
                            login_required=True,
646 638
                            template_name = 'im/astakosgroup_detail.html',
647 639
                            post_save_redirect = reverse('group_detail', kwargs=dict(group_id=group_id)),
648 640
                            extra_context = {'group':group,
649
                                             'quota':d})
641
                                             'quota':group.get_policies(),
642
                                             'more_policies':group.has_undefined_policies()})
650 643
@signed_terms_required
651 644
@login_required
652 645
def group_approval_request(request, group_id):

Also available in: Unified diff