Revision ade90760

b/snf-astakos-app/astakos/im/forms.py
508 508
            if commit: 
509 509
                g.save()
510 510
                g.owner = [request.user]
511
                g.approve_member(request.user)
511 512
            return g
512 513
    
513 514
    return AstakosGroupCreationForm
b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html
7 7
          <h2><span>NEW GROUP</span></h2>
8 8
            {% include "im/form_render.html" %}
9 9
            <div class="form-row submit">
10
                <input type="submit" class="submit altcol" value="NEXT" />
10
                <input type="submit" class="submit altcol" value="ADD POLICIES" />
11 11
            </div>
12 12
    </form>
13 13
</div>
b/snf-astakos-app/astakos/im/views.py
596 596

  
597 597
@signed_terms_required
598 598
@login_required
599
def user_group_list(request):
600
    list = AstakosGroup.objects.filter(membership__person=request.user)
601
    return object_list(request, queryset=list)
602

  
603
@signed_terms_required
604
@login_required
605
def owner_group_list(request):
606
    list = AstakosGroup.objects.filter(owner__id=request.user.id)
599
def group_list(request):
600
    relation = get_query(request).get('relation', 'member')
601
    if relation == 'member':
602
        list = AstakosGroup.objects.filter(membership__person=request.user)
603
    else:
604
        list = AstakosGroup.objects.filter(owner__id=request.user.id)
607 605
    return object_list(request, queryset=list)
608 606

  
609 607
@signed_terms_required

Also available in: Unified diff