add site to user creating admin so users can no longer be created without sites

[plstackapi.git] / planetstack / core / admin.py

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index ea86f4b..365c0dc 100644 (file)
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -633,7 +633,7 @@ class DeploymentAdmin(PlanetStackBaseAdmin):
 
     # nodes no longer direclty connected to deployments
     #suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags'),('imagedeployments','Images'))
-    suit_form_tabs =(('sites','Deployment Details'),('deploymentprivileges','Privileges'),,('imagedeployments','Images'))
+    suit_form_tabs =(('sites','Deployment Details'),('deploymentprivileges','Privileges'))
 
     def get_form(self, request, obj=None, **kwargs):
         if request.user.isReadOnlyUser():
@@ -770,6 +770,12 @@ class ServiceAdmin(PlanetStackBaseAdmin):
         ('serviceattrs','Additional Attributes'),
     )
 
+class SiteNodeInline(PlStackTabularInline):
+    model = Node
+    fields = ['name', 'site_deployment']
+    extra = 0
+    suit_classes = 'suit-tab suit-tab-nodes'
+
 class SiteAdmin(PlanetStackBaseAdmin):
     fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
     fieldsets = [
@@ -783,7 +789,7 @@ class SiteAdmin(PlanetStackBaseAdmin):
     list_display = ('backend_status_icon', 'name', 'login_base','site_url', 'enabled')
     list_display_links = ('backend_status_icon', 'name', )
     filter_horizontal = ('deployments',)
-    inlines = [SliceInline,UserInline,TagInline, SitePrivilegeInline, SiteDeploymentInline]
+    inlines = [SliceInline,UserInline,TagInline, SitePrivilegeInline, SiteDeploymentInline, SiteNodeInline]
     admin_inlines = [ControllerSiteInline]
     search_fields = ['name']
 
@@ -794,7 +800,7 @@ class SiteAdmin(PlanetStackBaseAdmin):
             ('siteprivileges','Privileges'),
             ('deployments','Deployments'),
             ('slices','Slices'),
-            #('nodes','Nodes'),
+            ('nodes','Nodes'),
         ]
 
         request=getattr(_thread_locals, "request", None)
@@ -929,6 +935,7 @@ class SliceAdmin(PlanetStackBaseAdmin):
           ('sliceprivileges','Privileges'),
           ('slivers','Slivers'),
           ('reservations','Reservations'),
+          ('tags','Tags'),
           ]
 
         request=getattr(_thread_locals, "request", None)
@@ -1242,7 +1249,7 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin):
     add_fieldsets = (
         (None, {
             'classes': ('wide',),
-            'fields': ('email', 'firstname', 'lastname', 'is_readonly', 'phone', 'public_key','password1', 'password2')},
+            'fields': ('site', 'email', 'firstname', 'lastname', 'is_readonly', 'phone', 'public_key','password1', 'password2')},
         ),
     )
     readonly_fields = ('backend_status_text', )
@@ -1286,9 +1293,10 @@ class ControllerDashboardViewInline(PlStackTabularInline):
 
 class DashboardViewAdmin(PlanetStackBaseAdmin):
     fieldsets = [('Dashboard View Details',
-                   {'fields': ['backend_status_text', 'name', 'url'],
+                   {'fields': ['backend_status_text', 'name', 'url', 'enabled'],
                     'classes': ['suit-tab suit-tab-general']})
                ]
+    list_display = ["name", "enabled", "url"]
     readonly_fields = ('backend_status_text', )
     inlines = [ControllerDashboardViewInline]