commit b81d5e4bddde33e038d9220c7fd3bf783fc5401d
author Tony Mack <tmack@tux.cs.princeton.edu> Fri Jan 30 10:58:29 2015 -0500
committer Tony Mack <tmack@tux.cs.princeton.edu> Fri Jan 30 11:07:08 2015 -0500
tree 1183b412a1a4bf1932b778d8950f07cf61496788
parent 1c83dcf4726eef5f4f6d7f4278b5083e097b637c

move site_deployments tab from SiteAdmin page to DeploymentAdmin page

planetstack/core/admin.py

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 73296e0..5b9f769 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -432,7 +432,7 @@
 class SiteDeploymentInline(PlStackTabularInline):
     model = SiteDeployment
     extra = 0
-    suit_classes = 'suit-tab suit-tab-deployments'
+    suit_classes = 'suit-tab suit-tab-sitedeployments'
     fields = ['backend_status_icon', 'deployment','site', 'controller']
     readonly_fields = ('backend_status_icon', )
 
@@ -624,7 +624,7 @@
     fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
     # node no longer directly connected to deployment
     #inlines = [DeploymentPrivilegeInline,NodeInline,TagInline,ImageDeploymentsInline]
-    inlines = [DeploymentPrivilegeInline,TagInline,ImageDeploymentsInline]
+    inlines = [DeploymentPrivilegeInline,TagInline,ImageDeploymentsInline,SiteDeploymentInline]
     list_display = ['backend_status_icon', 'name']
     list_display_links = ('backend_status_icon', 'name', )
     readonly_fields = ('backend_status_text', )
@@ -633,7 +633,7 @@
 
     # 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'))
+    suit_form_tabs =(('sites','Deployment Details'),('deploymentprivileges','Privileges'), ('sitedeployments', 'Site Deployments'))
 
     def get_form(self, request, obj=None, **kwargs):
         if request.user.isReadOnlyUser():
@@ -792,7 +792,7 @@
     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, SiteNodeInline]
+    inlines = [SliceInline,UserInline,TagInline, SitePrivilegeInline, SiteNodeInline]
     admin_inlines = [ControllerSiteInline]
     search_fields = ['name']
 
@@ -801,7 +801,6 @@
         tabs = [('general', 'Site Details'),
             ('users','Users'),
             ('siteprivileges','Privileges'),
-            ('deployments','Deployments'),
             ('slices','Slices'),
             ('nodes','Nodes'),
         ]