X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=523a9e1ec54a94181d4c65f8545ea082b80348d1;hb=9090aa68d7f3cc8eebd460b9daa823c105f9a1bb;hp=5ed2056bcb3ab123903c410c541239cc10dd8296;hpb=3115db4d25f14d84dcc248bdc470aef49df2aba8;p=myslice.git diff --git a/portal/actions.py b/portal/actions.py index 5ed2056b..523a9e1e 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -81,14 +81,18 @@ def get_jfed_identity(request): return None def getAuthorities(request, admin = False): - result = sfa_client(request,'List',hrn='onelab',object_type='authority',platforms=['myslice'],admin=admin) + # XXX theme has to be the same as the root authority + result = sfa_client(request,'List',hrn=theme.theme,object_type='authority',platforms=['myslice'],admin=admin) authorities = list() - for item in result['myslice']: - t_hrn = item['hrn'].split('.') - if 'name' in item: - authorities.append({'authority_hrn':item['hrn'], 'name':item['name'], 'shortname':t_hrn[-1].upper()}) - else: - authorities.append({'authority_hrn':item['hrn']}) + try: + for item in result['myslice']: + t_hrn = item['hrn'].split('.') + if 'name' in item: + authorities.append({'authority_hrn':item['hrn'], 'name':item['name'], 'shortname':t_hrn[-1].upper()}) + else: + authorities.append({'authority_hrn':item['hrn']}) + except: + logger.error(result) return sorted(authorities)