Revision 1ebea3d3 snf-astakos-app/astakos/im/api/__init__.py
b/snf-astakos-app/astakos/im/api/__init__.py | ||
---|---|---|
86 | 86 |
return decorator |
87 | 87 |
|
88 | 88 |
|
89 |
@api_method(http_method='GET') |
|
90 |
def get_services(request): |
|
91 |
callback = request.GET.get('callback', None) |
|
89 |
def get_services_dict(): |
|
92 | 90 |
services = Service.objects.all() |
93 | 91 |
data = tuple({'id': s.pk, 'name': s.name, 'url': s.url, 'icon': |
94 | 92 |
s.icon} for s in services) |
95 |
data = json.dumps(data) |
|
93 |
return data |
|
94 |
|
|
95 |
@api_method(http_method=None) |
|
96 |
def get_services(request): |
|
97 |
callback = request.GET.get('callback', None) |
|
96 | 98 |
mimetype = 'application/json' |
99 |
data = json.dumps(get_services_dict()) |
|
97 | 100 |
|
98 | 101 |
if callback: |
99 | 102 |
mimetype = 'application/javascript' |
... | ... | |
126 | 129 |
append(item( |
127 | 130 |
url=absolute(request, reverse('invite')), |
128 | 131 |
name="Invitations")) |
129 |
|
|
132 |
|
|
130 | 133 |
if QUOTAHOLDER_URL: |
131 | 134 |
append(item( |
132 | 135 |
url=absolute(request, reverse('project_list')), |
Also available in: Unified diff