X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fmethods%2Ftenantview.py;h=6c84b3e17f231517f545030df2158a1ef7d117b3;hb=b4fcd4005bcebbafc988a2e6bc0d2da2b7ffc908;hp=3fa98f639a9add4ac89d06b688fffcde4ed98ed4;hpb=462341a013fac9032894eb2e56f5a36dfa4fd468;p=plstackapi.git diff --git a/planetstack/core/xoslib/methods/tenantview.py b/planetstack/core/xoslib/methods/tenantview.py index 3fa98f6..6c84b3e 100644 --- a/planetstack/core/xoslib/methods/tenantview.py +++ b/planetstack/core/xoslib/methods/tenantview.py @@ -47,12 +47,19 @@ def getTenantViewDict(user): volumes.append(volume) site_users=[] - for auser in user.site.users.all(): - site_users.append(auser) - user_site_roles=[] - for priv in user.site.siteprivileges.filter(user=user): - user_site_roles.append(priv.role.role) + user_site_id=None + user_site_login_base=None + if not user.site: + pass # this is probably an error + else: + user_site_id = user.site.id + user_site_login_base = user.site.login_base + for auser in user.site.users.all(): + site_users.append(auser) + + for priv in user.site.siteprivileges.filter(user=user): + user_site_roles.append(priv.role.role) blessed_service_classes = [ServiceClass.objects.get(name="Best Effort")] @@ -68,8 +75,8 @@ def getTenantViewDict(user): "blessed_service_classes": [serviceclass.id for serviceclass in blessed_service_classes], "public_volume_names": [volume.name for volume in volumes], "public_volumes": [volume.id for volume in volumes], - "current_user_site_id": user.site.id, - "current_user_login_base": user.site.login_base, + "current_user_site_id": user_site_id, + "current_user_login_base": user_site_login_base, "current_user_site_users": [auser.id for auser in site_users], "current_user_site_user_names": [auser.email for auser in site_users], "current_user_can_create_slice": user.is_admin or ("pi" in user_site_roles) or ("admin" in user_site_roles),