good=False
for deployment in site.deployments.all():
if deployment.name in BLESSED_DEPLOYMENTS:
- good=True
+ # only bless sites that have at least one node in the deployment
+ sitedeployments = SiteDeployment.objects.filter(site=site, deployment=deployment)
+ for sd in sitedeployments.all():
+ if sd.nodes.count()>0:
+ good=True
if good:
blessed_sites.append(site)
if not volume.private:\r
volumes.append(volume)
+ site_users=[]
+ user_site_roles=[]
+ 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")]
return {"id": 0,
"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),
+ "current_user_id": user.id,
}
class TenantList(APIView):