Progress II

snf-astakos-app/astakos/im/forms.py

@@ -508,6 +508,7 @@ def get_astakos_group_creation_form(request):
             if commit: 
                 g.save()
                 g.owner = [request.user]
+                g.approve_member(request.user)
             return g
     
     return AstakosGroupCreationForm

snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html

@@ -7,7 +7,7 @@
           <h2><span>NEW GROUP</span></h2>
             {% include "im/form_render.html" %}
             <div class="form-row submit">
-                <input type="submit" class="submit altcol" value="NEXT" />
+                <input type="submit" class="submit altcol" value="ADD POLICIES" />
             </div>
     </form>
 </div>

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

@@ -596,14 +596,12 @@ def group_add(request):
 
 @signed_terms_required
 @login_required
-def user_group_list(request):
-    list = AstakosGroup.objects.filter(membership__person=request.user)
-    return object_list(request, queryset=list)
-
-@signed_terms_required
-@login_required
-def owner_group_list(request):
-    list = AstakosGroup.objects.filter(owner__id=request.user.id)
+def group_list(request):
+    relation = get_query(request).get('relation', 'member')
+    if relation == 'member':
+        list = AstakosGroup.objects.filter(membership__person=request.user)
+    else:
+        list = AstakosGroup.objects.filter(owner__id=request.user.id)
     return object_list(request, queryset=list)
 
 @signed_terms_required