Revision 373daf6a snf-astakos-app/astakos/im/views.py

b/snf-astakos-app/astakos/im/views.py
428 428
        response['Location'] = LOGOUT_NEXT
429 429
        response.status_code = 301
430 430
        return response
431
<<<<<<< HEAD
432 431
    messages.success(request, _('You have successfully logged out.'))
433
=======
434
    messages.add_message(request, messages.SUCCESS, _('<p>You have successfully logged out.</p>'))
435
>>>>>>> origin/newstyles
436 432
    context = get_context(request, extra_context)
437 433
    response.write(render_to_string(template, context_instance=context))
438 434
    return response
......
590 586
                           form = form,
591 587
                           context_instance = get_context(request,
592 588
                                                          extra_context))
593
<<<<<<< HEAD
594 589

  
595 590
@signed_terms_required
596 591
def group_add(request):
597 592
    return create_object(request,
598 593
                            form_class=get_astakos_group_creation_form(request),
599 594
                            login_required = True,
600
                            post_save_redirect = '/im/group/%(id)s/policies/add')
595
                            post_save_redirect = '/im/group/%(id)s/')
601 596

  
602 597
@signed_terms_required
603 598
@login_required
......
617 612
    except AstakosGroup.DoesNotExist:
618 613
        return HttpResponseBadRequest(_('Invalid group.'))
619 614
    d = {}
620
    for resource in group.policy.all():
621
        d[resource.name] = group.policy.through.objects.get(resource__id=resource.id,
622
                                                            group__id=group_id).limit  
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
    members = map(lambda m:{m.person.realname:m.is_approved}, group.membership_set.all())
623 620
    return object_detail(request,
624 621
                            AstakosGroup.objects.all(),
625 622
                            object_id=group_id,
626
                            extra_context = {'quota':d})
623
                            extra_context = {'quota':d,
624
                                             'members':members,
625
                                             'form':get_astakos_group_policy_creation_form(group)})
627 626

  
628 627
@signed_terms_required
629 628
@login_required
......
636 635
    try:
637 636
        group = AstakosGroup.objects.select_related().get(id=group_id)
638 637
    except AstakosGroup.DoesNotExist:
639
        raise HttpResponseBadRequest(_('Invalid group.'))
638
        return HttpResponseBadRequest(_('Invalid group.'))
640 639
    d = {}
641 640
    for resource in group.policy.all():
642 641
        d[resource.name] = group.policy.through.objects.get(resource__id=resource.id,
......
644 643
    return create_object(request,
645 644
                            form_class=get_astakos_group_policy_creation_form(group),
646 645
                            login_required=True,
647
                            post_save_redirect = reverse('group_policies_add', kwargs=dict(group_id=group_id)),
646
                            template_name = 'im/astakosgroup_detail.html',
647
                            post_save_redirect = reverse('group_detail', kwargs=dict(group_id=group_id)),
648 648
                            extra_context = {'group':group,
649 649
                                             'quota':d})
650 650
@signed_terms_required
......
652 652
def group_approval_request(request, group_id):
653 653
    return HttpResponse()
654 654
    
655
=======
656
>>>>>>> origin/newstyles

Also available in: Unified diff