Revision 6a933a9c

b/snf-astakos-app/astakos/im/api/__init__.py
40 40
from django.conf import settings
41 41
from django.core.urlresolvers import reverse
42 42

  
43
from astakos.im.models import AstakosUser, GroupKind, Service, Resource
43
from astakos.im.models import AstakosUser, Service, Resource
44 44
from astakos.im.api.faults import Fault, ItemNotFound, InternalServerError, BadRequest
45 45
from astakos.im.settings import (
46 46
    INVITATIONS_ENABLED, COOKIE_NAME, EMAILCHANGE_ENABLED, QUOTAHOLDER_URL)
b/snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py
40 40

  
41 41
from astakos.im.models import (
42 42
    AstakosUser,
43
#     AstakosGroup, GroupKind,
44 43
    Resource, Service, RESOURCE_SEPARATOR,
45 44
    Project, ProjectApplication, ProjectMembership, filter_queryset_by_property)
46 45
from astakos.im.api.backends.base import (
......
303 302
        # TODO return information for unknown ids
304 303
        q = Resource.objects.filter(service__id=service_id,
305 304
                                id__in=ids)
306
        q.delete()
307

  
308
#     @safe
309
#     def create_group(self, **kwargs):
310
#         policies = kwargs.pop('policies', ())
311
#         permissions = kwargs.pop('permissions', ())
312
#         members = kwargs.pop('members', ())
313
#         owners = kwargs.pop('owners', ())
314
# 
315
#         g = self._create_object(AstakosGroup, **kwargs)
316
# 
317
#         g.permissions = permissions
318
#         g.policies = policies
319
# #        g.members = members
320
#         g.owners = owners
321
#         return self._details(g)
305
        q.delete()
b/snf-astakos-app/astakos/im/context_processors.py
37 37
    GLOBAL_MESSAGES, PROFILE_EXTRA_LINKS)
38 38
from astakos.im.api import get_menu
39 39
from astakos.im.util import get_query
40
from astakos.im.models import GroupKind
41 40
from astakos.im.auth_providers import PROVIDERS as AUTH_PROVIDERS
42 41

  
43 42
from django.utils import simplejson as json
......
108 107
        return {}
109 108
    else:
110 109
        return {'menu': menu_items}
111

  
112

  
113
def group_kinds(request):
114
    return {'group_kinds': GroupKind.objects.exclude(
115
        name='default').values_list('name', flat=True)}

Also available in: Unified diff