Revision 1ebea3d3
| 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')),
|
| b/snf-astakos-app/astakos/im/views.py | ||
|---|---|---|
| 100 | 100 |
LOGGING_LEVEL, PAGINATE_BY, |
| 101 | 101 |
RESOURCES_PRESENTATION_DATA, PAGINATE_BY_ALL, |
| 102 | 102 |
MODERATION_ENABLED) |
| 103 |
from astakos.im.api import get_services |
|
| 103 |
from astakos.im.api import get_services_dict
|
|
| 104 | 104 |
from astakos.im import settings as astakos_settings |
| 105 | 105 |
from astakos.im.api.callpoint import AstakosCallpoint |
| 106 | 106 |
from astakos.im import auth_providers |
| ... | ... | |
| 399 | 399 |
# providers that user can add |
| 400 | 400 |
user_available_providers = request.user.get_available_auth_providers() |
| 401 | 401 |
|
| 402 |
try: |
|
| 403 |
resp = get_services(request) |
|
| 404 |
except Exception, e: |
|
| 405 |
services = () |
|
| 406 |
else: |
|
| 407 |
services = json.loads(resp.content) |
|
| 408 |
extra_context['services'] = services |
|
| 402 |
extra_context['services'] = get_services_dict() |
|
| 409 | 403 |
return render_response(template_name, |
| 410 | 404 |
profile_form = form, |
| 411 | 405 |
user_providers = user_providers, |
Also available in: Unified diff