Revision 8ee54f74 snf-astakos-app/astakos/im/models.py
b/snf-astakos-app/astakos/im/models.py | ||
---|---|---|
137 | 137 |
def catalog(cls, orderfor=None): |
138 | 138 |
catalog = {} |
139 | 139 |
services = list(cls.objects.all()) |
140 |
metadata = presentation.SERVICES |
|
141 |
metadata = dict_merge(presentation.SERVICES, |
|
142 |
astakos_settings.SERVICES_META) |
|
140 |
default_metadata = presentation.SERVICES |
|
141 |
metadata = {} |
|
143 | 142 |
|
144 | 143 |
for service in services: |
145 | 144 |
d = {'api_url': service.api_url, |
146 | 145 |
'url': service.url, |
147 | 146 |
'name': service.name} |
148 |
if service.name in metadata: |
|
147 |
if service.name in default_metadata: |
|
148 |
metadata[service.name] = default_metadata.get(service.name) |
|
149 | 149 |
metadata[service.name].update(d) |
150 | 150 |
else: |
151 | 151 |
metadata[service.name] = d |
152 | 152 |
|
153 |
|
|
153 | 154 |
def service_by_order(s): |
154 | 155 |
return s[1].get('order') |
155 | 156 |
|
156 | 157 |
def service_by_dashbaord_order(s): |
157 | 158 |
return s[1].get('dashboard').get('order') |
158 | 159 |
|
160 |
metadata = dict_merge(metadata, |
|
161 |
astakos_settings.SERVICES_META) |
|
162 |
|
|
159 | 163 |
for service, info in metadata.iteritems(): |
160 | 164 |
default_meta = presentation.service_defaults(service) |
161 | 165 |
base_meta = metadata.get(service, {}) |
Also available in: Unified diff