Commit 44384026 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Service catalog fix

also include services for which no existing presentation data exist.
Admin can use ASTAKOS_SERVICE_META setting to customize the service
presentation metadata.
parent ec59c09e
...@@ -154,10 +154,15 @@ class Service(models.Model): ...@@ -154,10 +154,15 @@ class Service(models.Model):
metadata = presentation.SERVICES metadata = presentation.SERVICES
metadata = dict_merge(presentation.SERVICES, metadata = dict_merge(presentation.SERVICES,
astakos_settings.SERVICES_META) astakos_settings.SERVICES_META)
for service in services: for service in services:
d = {'api_url': service.api_url,
'url': service.url,
'name': service.name}
if service.name in metadata: if service.name in metadata:
d = {'api_url': service.api_url, 'name': service.name}
metadata[service.name].update(d) metadata[service.name].update(d)
else:
metadata[service.name] = d
def service_by_order(s): def service_by_order(s):
return s[1].get('order') return s[1].get('order')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment