Revision 29b0ec5a
b/snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py | ||
---|---|---|
306 | 306 |
|
307 | 307 |
g.permissions = permissions |
308 | 308 |
g.policies = policies |
309 |
g.members = members |
|
309 |
# g.members = members
|
|
310 | 310 |
g.owners = owners |
311 | 311 |
return self._list(AstakosGroup, filter=(g.id,)) |
b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html | ||
---|---|---|
33 | 33 |
<li class="create"> |
34 | 34 |
<div> |
35 | 35 |
<div class="wrap"> |
36 |
<p><a href="{% url group_add 'course' %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
|
|
36 |
<p><a href="{% url group_add 'project' %}"><img alt="THINK ABOUT IT" src="/static/im/images/create.png"></a></p>
|
|
37 | 37 |
<p class="txt">Create a new Project in seconds. Specify how many members it will have, which and how many virtual resources it will provide to its members. Describe its purpose. Submit your request and if accepted, you and your colleagues are ready to deploy! </p> |
38 |
<p><a href="{% url group_add 'default' %}">create a project ></a></p>
|
|
38 |
<p><a href="{% url group_add 'project' %}">create a project ></a></p>
|
|
39 | 39 |
<!--<p class="btn"><a href="{% url group_create_list %}" class="submit">CREATE</a></p>--> |
40 | 40 |
</div> |
41 | 41 |
</div> |
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
58 | 58 |
from django.views.generic.list_detail import object_list |
59 | 59 |
from django.core.xheaders import populate_xheaders |
60 | 60 |
from django.core.exceptions import ValidationError, PermissionDenied |
61 |
|
|
62 | 61 |
from django.template.loader import render_to_string |
63 | 62 |
from django.views.decorators.http import require_http_methods |
64 |
from astakos.im.activation_backends import get_backend, SimpleBackend
|
|
63 |
from django.db.models import Q
|
|
65 | 64 |
|
65 |
from astakos.im.activation_backends import get_backend, SimpleBackend |
|
66 | 66 |
from astakos.im.models import (AstakosUser, ApprovalTerms, AstakosGroup, |
67 | 67 |
EmailChange, GroupKind, Membership, |
68 | 68 |
RESOURCE_SEPARATOR, AstakosUserAuthProvider) |
... | ... | |
937 | 937 |
LEFT JOIN auth_user as owner ON ( |
938 | 938 |
im_astakosuser_owner.astakosuser_id = owner.id) |
939 | 939 |
WHERE im_membership.person_id = %(userid)s |
940 |
AND im_groupkind.name != 'default' |
|
940 | 941 |
""" |
941 | 942 |
params = {'userid':request.user.id} |
942 | 943 |
|
... | ... | |
1073 | 1074 |
sorting = 'groupname' |
1074 | 1075 |
if q: |
1075 | 1076 |
queryset = AstakosGroup.objects.select_related() |
1077 |
queryset = queryset.filter(~Q(kind__name='default')) |
|
1076 | 1078 |
queryset = queryset.filter(name__contains=q) |
1077 | 1079 |
queryset = queryset.filter(approval_date__isnull=False) |
1078 | 1080 |
queryset = queryset.extra(select={ |
... | ... | |
1130 | 1132 |
@login_required |
1131 | 1133 |
def group_all(request, extra_context=None, **kwargs): |
1132 | 1134 |
q = AstakosGroup.objects.select_related() |
1135 |
q = q.filter(~Q(kind__name='default')) |
|
1133 | 1136 |
q = q.filter(approval_date__isnull=False) |
1134 | 1137 |
q = q.extra(select={ |
1135 | 1138 |
'groupname': "auth_group.name", |
Also available in: Unified diff