Revision ffb1e7a8 snf-astakos-app/astakos/im/views.py
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
610 | 610 |
AstakosGroup.objects.all(), |
611 | 611 |
object_id=group_id, |
612 | 612 |
extra_context = {'form':get_astakos_group_policy_creation_form(group), |
613 |
'quota':group.policies,
|
|
613 |
'quota':group.quota,
|
|
614 | 614 |
'more_policies':group.has_undefined_policies}) |
615 | 615 |
|
616 | 616 |
@signed_terms_required |
... | ... | |
631 | 631 |
template_name = 'im/astakosgroup_detail.html', |
632 | 632 |
post_save_redirect = reverse('group_detail', kwargs=dict(group_id=group_id)), |
633 | 633 |
extra_context = {'group':group, |
634 |
'quota':group.policies,
|
|
634 |
'quota':group.quota,
|
|
635 | 635 |
'more_policies':group.has_undefined_policies}) |
636 | 636 |
@signed_terms_required |
637 | 637 |
@login_required |
... | ... | |
686 | 686 |
def handle_membership(): |
687 | 687 |
def decorator(func): |
688 | 688 |
@wraps(func) |
689 |
def wrapper(request, membership_id):
|
|
689 |
def wrapper(request, group_id, user_id):
|
|
690 | 690 |
try: |
691 |
m = Membership.objects.select_related().get(id=membership_id)
|
|
691 |
m = Membership.objects.select_related().get(group__id=group_id, person__id=user_id)
|
|
692 | 692 |
except Membership.DoesNotExist: |
693 | 693 |
return HttpResponseBadRequest(_('Invalid membership.')) |
694 | 694 |
else: |
... | ... | |
698 | 698 |
return render_response(template='im/astakosgroup_detail.html', |
699 | 699 |
context_instance=get_context(request), |
700 | 700 |
object=m.group, |
701 |
quota=m.group.policies,
|
|
701 |
quota=m.group.quota,
|
|
702 | 702 |
more_policies=m.group.has_undefined_policies) |
703 | 703 |
return wrapper |
704 | 704 |
return decorator |
... | ... | |
730 | 730 |
logger.exception(e) |
731 | 731 |
msg = _('Something went wrong during %s\'s disapproval.' % realname) |
732 | 732 |
messages.error(request, msg) |
733 |
|
|
734 |
@signed_terms_required |
|
735 |
@login_required |
|
736 |
def resource_list(request): |
|
737 |
return render_response(template='im/astakosuserquota_list.html', |
|
738 |
context_instance=get_context(request), |
|
739 |
quota=request.user.quota) |
Also available in: Unified diff