filter sites with no nodes from tenant view

[plstackapi.git] / planetstack / core / xoslib / methods / tenantview.py

diff --git a/planetstack/core/xoslib/methods/tenantview.py b/planetstack/core/xoslib/methods/tenantview.py
index 6c84b3e..44db514 100644 (file)
--- a/planetstack/core/xoslib/methods/tenantview.py
+++ b/planetstack/core/xoslib/methods/tenantview.py
@@ -19,7 +19,11 @@ def getTenantViewDict(user):
         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)
 
@@ -80,6 +84,7 @@ def getTenantViewDict(user):
             "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):